From 8cc4063160101e5242f783316d67cb47a5e16da5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Oct 2018 12:11:30 +0200 Subject: [PATCH 001/994] feat: option to specify the very bottom thickness --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index efa6b9a78c..83c0b88088 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1176,6 +1176,18 @@ "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true + }, + "initial_bottom_layers": + { + "label": "Initial Bottom Layers", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", + "minimum_value": "0", + "minimum_value_warning": "2", + "default_value": 6, + "type": "int", + "value": "bottom_layers", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true } } } From 67d9db41626d1449eb45b897e1d09edc790de543 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 12 Apr 2019 19:14:14 +0100 Subject: [PATCH 002/994] Added bridge_sparse_infill_max_density to specify max density of sparse infill. A skin that is over sparse infill is considered to be unsupported for bridging purposes. --- resources/definitions/fdmprinter.def.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8ce0246a93..bc6035bd25 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6750,6 +6750,16 @@ "enabled": "bridge_settings_enabled", "settable_per_mesh": true }, + "bridge_sparse_infill_max_density": + { + "label": "Bridge Sparse Infill Max Density", + "description": "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin.", + "unit": "%", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "settable_per_mesh": true + }, "bridge_wall_coast": { "label": "Bridge Wall Coasting", From abea176f7bb88b3c70f3a7d22789a35bb8ea92bd Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Sat, 4 May 2019 15:31:31 +0100 Subject: [PATCH 003/994] Should only be visible when bridge settings are enabled. --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index bc6035bd25..4c19ec2cd1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6758,6 +6758,7 @@ "type": "float", "default_value": 0, "minimum_value": "0", + "enabled": "bridge_settings_enabled", "settable_per_mesh": true }, "bridge_wall_coast": From ba878ccff085365e0cf6f420a7c20d3e309ccd26 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 12:08:16 +0200 Subject: [PATCH 004/994] fix luminance computation --- plugins/ImageReader/ImageReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index e720ce4854..c59151f1cb 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -99,8 +99,8 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - avg = float(qRed(qrgb) + qGreen(qrgb) + qBlue(qrgb)) / (3 * 255) - height_data[y, x] = avg + luminance = (0.2126 * qRed(qrgb) + 0.7152 * qGreen(qrgb) + 0.0722 * qBlue(qrgb)) / 255 # fast computation ignoring gamma + height_data[y, x] = luminance Job.yieldThread() From 31683287505372d20d0e9488427c60af8d76a0f8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 12:10:18 +0200 Subject: [PATCH 005/994] feat: use logarithmic conversion for lithophanes --- plugins/ImageReader/ConfigUI.qml | 22 ++++++++++++++++++++++ plugins/ImageReader/ImageReader.py | 16 ++++++++++++---- plugins/ImageReader/ImageReaderUI.py | 6 ++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 47ba10778c..ef28c174f2 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -143,6 +143,28 @@ UM.Dialog } } + UM.TooltipArea { + Layout.fillWidth:true + height: childrenRect.height + text: catalog.i18nc("@info:tooltip","For lithophanes a logarithmic function is more appropriate for most materials. For height maps the pixel values correspond to heights linearly.") + Row { + width: parent.width + + Label { + text: "Conversion" + width: 150 * screenScaleFactor + anchors.verticalCenter: parent.verticalCenter + } + ComboBox { + id: conversion + objectName: "Conversion" + model: [ catalog.i18nc("@item:inlistbox","Logarithmic"), catalog.i18nc("@item:inlistbox","Linear") ] + width: 180 * screenScaleFactor + onCurrentIndexChanged: { manager.onConvertFunctionChanged(currentIndex) } + } + } + } + UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index c59151f1cb..bfaa6eb48c 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -3,6 +3,8 @@ import numpy +import math + from PyQt5.QtGui import QImage, qRed, qGreen, qBlue from PyQt5.QtCore import Qt @@ -46,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function): scene_node = SceneNode() mesh = MeshBuilder() @@ -124,8 +126,14 @@ class ImageReader(MeshReader): Job.yieldThread() - height_data *= scale_vector.y - height_data += base_height + if use_logarithmic_function: + min_luminance = 2.0 ** (peak_height - base_height) + for (y, x) in numpy.ndindex(height_data.shape): + mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] + height_data[y, x] = peak_height - math.log(mapped_luminance, 2) + else: + height_data *= scale_vector.y + height_data += base_height heightmap_face_count = 2 * height_minus_one * width_minus_one total_face_count = heightmap_face_count + (width_minus_one * 2) * (height_minus_one * 2) + 2 diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 213468a2ab..c769a8c264 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -34,6 +34,7 @@ class ImageReaderUI(QObject): self.peak_height = 2.5 self.smoothing = 1 self.lighter_is_higher = False; + self.use_logarithmic_function = False; self._ui_lock = threading.Lock() self._cancelled = False @@ -144,3 +145,8 @@ class ImageReaderUI(QObject): @pyqtSlot(int) def onImageColorInvertChanged(self, value): self.lighter_is_higher = (value == 1) + + @pyqtSlot(int) + def onConvertFunctionChanged(self, value): + self.use_logarithmic_function = (value == 0) + From 9066f5f6d4f484cb2e3cfd8e83a79cfa39fb294f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:18:07 +0200 Subject: [PATCH 006/994] fix translucency model using new permittance setting --- plugins/ImageReader/ConfigUI.qml | 23 +++++++++++++++++++++++ plugins/ImageReader/ImageReader.py | 9 +++++---- plugins/ImageReader/ImageReaderUI.py | 5 +++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index ef28c174f2..491594fa58 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -165,6 +165,29 @@ UM.Dialog } } + UM.TooltipArea { + Layout.fillWidth:true + height: childrenRect.height + text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter.") + Row { + width: parent.width + + Label { + text: catalog.i18nc("@action:label", "1mm Transmittance (%)") + width: 150 * screenScaleFactor + anchors.verticalCenter: parent.verticalCenter + } + TextField { + id: transmittance + objectName: "Transmittance" + focus: true + validator: RegExpValidator {regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/} + width: 180 * screenScaleFactor + onTextChanged: { manager.onTransmittanceChanged(text) } + } + } + } + UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index bfaa6eb48c..ce3cab0b8f 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -48,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function, self._ui.transmittance_1mm) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function, transmittance_1mm): scene_node = SceneNode() mesh = MeshBuilder() @@ -127,10 +127,11 @@ class ImageReader(MeshReader): Job.yieldThread() if use_logarithmic_function: - min_luminance = 2.0 ** (peak_height - base_height) + p = 1.0 / math.log(transmittance_1mm / 100.0, 2) + min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = peak_height - math.log(mapped_luminance, 2) + height_data[y, x] = peak_height - p * math.log(mapped_luminance, 2) else: height_data *= scale_vector.y height_data += base_height diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index c769a8c264..67d6444538 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,6 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_logarithmic_function = False; + self.transmittance_1mm = 40.0; self._ui_lock = threading.Lock() self._cancelled = False @@ -76,6 +77,7 @@ class ImageReaderUI(QObject): self._ui_view.findChild(QObject, "Base_Height").setProperty("text", str(self.base_height)) self._ui_view.findChild(QObject, "Peak_Height").setProperty("text", str(self.peak_height)) + self._ui_view.findChild(QObject, "Transmittance").setProperty("text", str(self.transmittance_1mm)) self._ui_view.findChild(QObject, "Smoothing").setProperty("value", self.smoothing) def _createConfigUI(self): @@ -150,3 +152,6 @@ class ImageReaderUI(QObject): def onConvertFunctionChanged(self, value): self.use_logarithmic_function = (value == 0) + @pyqtSlot(int) + def onTransmittanceChanged(self, value): + self.transmittance_1mm = value From beaa5e0b7a300e3eab1eeaff79749ce4fb934632 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:21:05 +0200 Subject: [PATCH 007/994] fix luminance computation --- plugins/ImageReader/ImageReader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index ce3cab0b8f..50825f2464 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -101,8 +101,10 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - luminance = (0.2126 * qRed(qrgb) + 0.7152 * qGreen(qrgb) + 0.0722 * qBlue(qrgb)) / 255 # fast computation ignoring gamma - height_data[y, x] = luminance + if use_logarithmic_function: + height_data[y, x] = (0.299 * math.pow(qRed(qrgb) / 255.0, 2.2) + 0.587 * math.pow(qGreen(qrgb) / 255.0, 2.2) + 0.114 * math.pow(qBlue(qrgb) / 255.0, 2.2)) + else: + height_data[y, x] = (0.212655 * qRed(qrgb) + 0.715158 * qGreen(qrgb) + 0.072187 * qBlue(qrgb)) / 255 # fast computation ignoring gamma and degamma Job.yieldThread() From 5b9a18f5dfc0b1fd15cc5cec3bed015b7f394d1c Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:27:51 +0200 Subject: [PATCH 008/994] make naming of Logarithmic Conversion Function intelligible --- plugins/ImageReader/ConfigUI.qml | 12 ++++++------ plugins/ImageReader/ImageReader.py | 8 ++++---- plugins/ImageReader/ImageReaderUI.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 491594fa58..8a4ac67b3e 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -146,21 +146,21 @@ UM.Dialog UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height - text: catalog.i18nc("@info:tooltip","For lithophanes a logarithmic function is more appropriate for most materials. For height maps the pixel values correspond to heights linearly.") + text: catalog.i18nc("@info:tooltip","For lithophanes a simple logarithmic model for translucency is available. For height maps the pixel values correspond to heights linearly.") Row { width: parent.width Label { - text: "Conversion" + text: "Color Model" width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } ComboBox { - id: conversion - objectName: "Conversion" - model: [ catalog.i18nc("@item:inlistbox","Logarithmic"), catalog.i18nc("@item:inlistbox","Linear") ] + id: color_model + objectName: "ColorModel" + model: [ catalog.i18nc("@item:inlistbox","Translucency"), catalog.i18nc("@item:inlistbox","Linear") ] width: 180 * screenScaleFactor - onCurrentIndexChanged: { manager.onConvertFunctionChanged(currentIndex) } + onCurrentIndexChanged: { manager.onColorModelChanged(currentIndex) } } } } diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 50825f2464..0086736f6d 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -48,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function, self._ui.transmittance_1mm) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_transparency_model, self._ui.transmittance_1mm) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function, transmittance_1mm): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_transparency_model, transmittance_1mm): scene_node = SceneNode() mesh = MeshBuilder() @@ -101,7 +101,7 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - if use_logarithmic_function: + if use_transparency_model: height_data[y, x] = (0.299 * math.pow(qRed(qrgb) / 255.0, 2.2) + 0.587 * math.pow(qGreen(qrgb) / 255.0, 2.2) + 0.114 * math.pow(qBlue(qrgb) / 255.0, 2.2)) else: height_data[y, x] = (0.212655 * qRed(qrgb) + 0.715158 * qGreen(qrgb) + 0.072187 * qBlue(qrgb)) / 255 # fast computation ignoring gamma and degamma @@ -128,7 +128,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if use_logarithmic_function: + if use_transparency_model: p = 1.0 / math.log(transmittance_1mm / 100.0, 2) min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 67d6444538..41d8741b38 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -34,7 +34,7 @@ class ImageReaderUI(QObject): self.peak_height = 2.5 self.smoothing = 1 self.lighter_is_higher = False; - self.use_logarithmic_function = False; + self.use_transparency_model = True; self.transmittance_1mm = 40.0; self._ui_lock = threading.Lock() @@ -149,8 +149,8 @@ class ImageReaderUI(QObject): self.lighter_is_higher = (value == 1) @pyqtSlot(int) - def onConvertFunctionChanged(self, value): - self.use_logarithmic_function = (value == 0) + def onColorModelChanged(self, value): + self.use_transparency_model = (value == 0) @pyqtSlot(int) def onTransmittanceChanged(self, value): From 3e0b756a6d9654ed180f97d47a8b0412dc063a66 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:37:14 +0200 Subject: [PATCH 009/994] explain litho transmittance better --- plugins/ImageReader/ConfigUI.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 8a4ac67b3e..842ca612d9 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -168,7 +168,7 @@ UM.Dialog UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height - text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter.") + text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter. Lowering this value increases the contrast in dark regions and decreases the contrast in light regions of the image.") Row { width: parent.width From 236b7574c0bf5415535fde6ca559ebfa7bc8eeb7 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:55:10 +0200 Subject: [PATCH 010/994] fix litho thickness computation --- plugins/ImageReader/ImageReader.py | 4 ++-- plugins/ImageReader/ImageReaderUI.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 0086736f6d..2084844548 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -108,7 +108,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if not lighter_is_higher: + if lighter_is_higher is use_transparency_model: height_data = 1 - height_data for _ in range(0, blur_iterations): @@ -133,7 +133,7 @@ class ImageReader(MeshReader): min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = peak_height - p * math.log(mapped_luminance, 2) + height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) else: height_data *= scale_vector.y height_data += base_height diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 41d8741b38..0fb9ea78de 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,7 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_transparency_model = True; - self.transmittance_1mm = 40.0; + self.transmittance_1mm = 20.0; # based on pearl PLA self._ui_lock = threading.Lock() self._cancelled = False From e59641eb67663c302f0139421c94fde29db64de1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 20:19:29 +0200 Subject: [PATCH 011/994] based transmittance on measurements on print ratio of luminance of 1.4mm thickness to luminance at 0.4mm --- plugins/ImageReader/ImageReaderUI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 0fb9ea78de..a61fabb742 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,7 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_transparency_model = True; - self.transmittance_1mm = 20.0; # based on pearl PLA + self.transmittance_1mm = 50.0; # based on pearl PLA self._ui_lock = threading.Lock() self._cancelled = False From 2e71ce27109a25e2fa391aad2df1b016f79cab63 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 10:52:19 +0200 Subject: [PATCH 012/994] Added intent to the CuraContainerStack CURA-6534 --- cura/Settings/CuraContainerStack.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 042b065226..c3951bb178 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -87,6 +87,19 @@ class CuraContainerStack(ContainerStack): def qualityChanges(self) -> InstanceContainer: return cast(InstanceContainer, self._containers[_ContainerIndexes.QualityChanges]) + ## Set the intent container. + # + # \param new_intent The new intent container. It is expected to have a "type" metadata entry with the value "intent". + def setIntent(self, new_intent: InstanceContainer, postpone_emit: bool = False) -> None: + self.replaceContainer(_ContainerIndexes.Quality, new_intent, postpone_emit=postpone_emit) + + ## Get the quality container. + # + # \return The intent container. Should always be a valid container, but can be equal to the empty InstanceContainer. + @pyqtProperty(InstanceContainer, fset=setIntent, notify=pyqtContainersChanged) + def intent(self) -> InstanceContainer: + return cast(InstanceContainer, self._containers[_ContainerIndexes.Intent]) + ## Set the quality container. # # \param new_quality The new quality container. It is expected to have a "type" metadata entry with the value "quality". @@ -330,16 +343,18 @@ class CuraContainerStack(ContainerStack): class _ContainerIndexes: UserChanges = 0 QualityChanges = 1 - Quality = 2 - Material = 3 - Variant = 4 - DefinitionChanges = 5 - Definition = 6 + Intent = 2 + Quality = 3 + Material = 4 + Variant = 5 + DefinitionChanges = 6 + Definition = 7 # Simple hash map to map from index to "type" metadata entry IndexTypeMap = { UserChanges: "user", QualityChanges: "quality_changes", + Intent: "intent", Quality: "quality", Material: "material", Variant: "variant", From a595feb24ed3b34a87b0601afffd25638a51574c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 11:10:20 +0200 Subject: [PATCH 013/994] Increase the version of the CuraContainer stack Since we added a new layer to it, it's version is one level higher (*DING*) CURA-6534 --- cura/CuraApplication.py | 5 +++-- cura/Settings/CuraContainerStack.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 58fc9fc394..aa495377d3 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -100,6 +100,7 @@ from cura.Settings.ContainerManager import ContainerManager from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions from cura.Settings.ExtruderManager import ExtruderManager +from cura.Settings.ExtruderStack import ExtruderStack from cura.Settings.MachineManager import MachineManager from cura.Settings.MachineNameValidator import MachineNameValidator from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler @@ -446,8 +447,8 @@ class CuraApplication(QtApplication): { ("quality", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityChangesInstanceContainer, "application/x-uranium-instancecontainer"), - ("machine_stack", ContainerStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), - ("extruder_train", ContainerStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), + ("machine_stack", GlobalStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), + ("extruder_train", ExtruderStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index c3951bb178..af319ceb51 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -37,6 +37,8 @@ from . import Exceptions # This also means that operations on the stack that modifies the container ordering is prohibited and # will raise an exception. class CuraContainerStack(ContainerStack): + Version = 5 # type: int + def __init__(self, container_id: str) -> None: super().__init__(container_id) From a1bbb465555670ee0396d53c34e5e7aa1cd83c2d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 11:15:59 +0200 Subject: [PATCH 014/994] Add intent to recognised resource types CURA-6534 --- cura/CuraApplication.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index aa495377d3..5748746a84 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -130,13 +130,12 @@ from . import CuraActions from . import PrintJobPreviewImageProvider from cura import ApplicationMetadata, UltimakerCloudAuthentication +from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.Machines.MaterialManager import MaterialManager from cura.Machines.QualityManager import QualityManager from UM.Settings.EmptyInstanceContainer import EmptyInstanceContainer - from cura.Settings.GlobalStack import GlobalStack - numpy.seterr(all = "ignore") @@ -161,6 +160,7 @@ class CuraApplication(QtApplication): ExtruderStack = Resources.UserType + 9 DefinitionChangesContainer = Resources.UserType + 10 SettingVisibilityPreset = Resources.UserType + 11 + IntentInstanceContainer = Resources.UserType + 12 Q_ENUMS(ResourceTypes) @@ -346,7 +346,7 @@ class CuraApplication(QtApplication): # Adds expected directory names and search paths for Resources. def __addExpectedResourceDirsAndSearchPaths(self): # this list of dir names will be used by UM to detect an old cura directory - for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "quality_changes", "user", "variants"]: + for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "quality_changes", "user", "variants", "intent"]: Resources.addExpectedDirNameInData(dir_name) Resources.addSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) @@ -404,6 +404,7 @@ class CuraApplication(QtApplication): Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances") Resources.addStorageType(self.ResourceTypes.DefinitionChangesContainer, "definition_changes") Resources.addStorageType(self.ResourceTypes.SettingVisibilityPreset, "setting_visibility") + Resources.addStorageType(self.ResourceTypes.IntentInstanceContainer, "intent") self._container_registry.addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality") self._container_registry.addResourceType(self.ResourceTypes.QualityChangesInstanceContainer, "quality_changes") @@ -413,6 +414,7 @@ class CuraApplication(QtApplication): self._container_registry.addResourceType(self.ResourceTypes.ExtruderStack, "extruder_train") self._container_registry.addResourceType(self.ResourceTypes.MachineStack, "machine") self._container_registry.addResourceType(self.ResourceTypes.DefinitionChangesContainer, "definition_changes") + self._container_registry.addResourceType(self.ResourceTypes.IntentInstanceContainer, "intent") Resources.addType(self.ResourceTypes.QmlFiles, "qml") Resources.addType(self.ResourceTypes.Firmware, "firmware") @@ -445,14 +447,15 @@ class CuraApplication(QtApplication): def __setLatestResouceVersionsForVersionUpgrade(self): self._version_upgrade_manager.setCurrentVersions( { - ("quality", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), - ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityChangesInstanceContainer, "application/x-uranium-instancecontainer"), - ("machine_stack", GlobalStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), - ("extruder_train", ExtruderStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), - ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), - ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), - ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), - ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), + ("quality", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), + ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityChangesInstanceContainer, "application/x-uranium-instancecontainer"), + ("intent", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.IntentInstanceContainer, "application/x-uranium-instancecontainer"), + ("machine_stack", GlobalStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), + ("extruder_train", ExtruderStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), + ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), + ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), + ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), + ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), } ) From 7cc4ac741ceef571fb69b1d4359297c4fcf794ba Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 11:49:03 +0200 Subject: [PATCH 015/994] Add version upgrade that adds empty intent profile to the stacks CURA-6534 --- cura/CuraApplication.py | 4 ++ .../cura_empty_instance_containers.py | 9 ++++ .../VersionUpgrade41to42.py | 42 +++++++++++++++++++ .../VersionUpgrade41to42/__init__.py | 34 +++++++++++++++ .../VersionUpgrade41to42/plugin.json | 8 ++++ resources/bundled_packages/cura.json | 17 ++++++++ 6 files changed, 114 insertions(+) create mode 100644 plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5748746a84..2f0568693f 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -197,6 +197,7 @@ class CuraApplication(QtApplication): self.empty_container = None # type: EmptyInstanceContainer self.empty_definition_changes_container = None # type: EmptyInstanceContainer self.empty_variant_container = None # type: EmptyInstanceContainer + self.empty_intent_container = None # type: EmptyInstanceContainer self.empty_material_container = None # type: EmptyInstanceContainer self.empty_quality_container = None # type: EmptyInstanceContainer self.empty_quality_changes_container = None # type: EmptyInstanceContainer @@ -433,6 +434,9 @@ class CuraApplication(QtApplication): self._container_registry.addContainer(cura.Settings.cura_empty_instance_containers.empty_variant_container) self.empty_variant_container = cura.Settings.cura_empty_instance_containers.empty_variant_container + self._container_registry.addContainer(cura.Settings.cura_empty_instance_containers.empty_intent_container) + self.empty_intent_container = cura.Settings.cura_empty_instance_containers.empty_intent_container + self._container_registry.addContainer(cura.Settings.cura_empty_instance_containers.empty_material_container) self.empty_material_container = cura.Settings.cura_empty_instance_containers.empty_material_container diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index 0eedfc8654..62b01d32d9 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -42,6 +42,12 @@ empty_quality_changes_container.setMetaDataEntry("id", EMPTY_QUALITY_CHANGES_CON empty_quality_changes_container.setMetaDataEntry("type", "quality_changes") empty_quality_changes_container.setMetaDataEntry("quality_type", "not_supported") +# Empty intent +EMPTY_INTENT_CONTAINER_ID = "empty_intent" +empty_intent_container = copy.deepcopy(empty_container) +empty_intent_container.setMetaDataEntry("id", EMPTY_INTENT_CONTAINER_ID) +empty_intent_container.setMetaDataEntry("type", "intent") + # All empty container IDs set ALL_EMPTY_CONTAINER_ID_SET = { @@ -51,6 +57,7 @@ ALL_EMPTY_CONTAINER_ID_SET = { EMPTY_MATERIAL_CONTAINER_ID, EMPTY_QUALITY_CONTAINER_ID, EMPTY_QUALITY_CHANGES_CONTAINER_ID, + EMPTY_INTENT_CONTAINER_ID } @@ -73,4 +80,6 @@ __all__ = ["EMPTY_CONTAINER_ID", "empty_quality_container", "ALL_EMPTY_CONTAINER_ID_SET", "isEmptyContainer", + "EMPTY_INTENT_CONTAINER_ID", + "empty_intent_container" ] diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py new file mode 100644 index 0000000000..bc12f0d384 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -0,0 +1,42 @@ +## Upgrades configurations from the state they were in at version 4.1 to the +# state they should be in at version 4.2. +import configparser +import io +from typing import Tuple, List + +from UM.VersionUpgrade import VersionUpgrade + + +class VersionUpgrade41to42(VersionUpgrade): + + def getCfgVersion(self, serialised: str) -> int: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialised) + format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised. + setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) + return format_version * 1000000 + setting_version + + ## Upgrades stacks to have the new version number. + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation=None) + parser.read_string(serialized) + + # We should only have 6 levels when we start. + assert "7" not in parser["containers"] + + # Update version number. + parser["general"]["version"] = "5" + + # We added the intent container in Cura 4.2. This means that all other containers move one step down. + parser["containers"]["7"] = parser["containers"]["6"] + parser["containers"]["6"] = parser["containers"]["5"] + parser["containers"]["5"] = parser["containers"]["4"] + parser["containers"]["4"] = parser["containers"]["3"] + parser["containers"]["3"] = parser["containers"]["2"] + parser["containers"]["2"] = "empty_intent" + + result = io.StringIO() + parser.write(result) + + return [filename], [result.getvalue()] + \ No newline at end of file diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py new file mode 100644 index 0000000000..b6c83d9328 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py @@ -0,0 +1,34 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade41to42 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade41to42.VersionUpgrade41to42() + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("machine_stack", 4000007): ("machine_stack", 5000007, upgrade.upgradeStack), + ("extruder_train", 4000007): ("extruder_train", 5000007, upgrade.upgradeStack) + }, + "sources": { + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json new file mode 100644 index 0000000000..9f8edea286 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.1 to 4.2", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", + "api": "6.0", + "i18n-catalog": "cura" +} diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 259ac05201..c45894e537 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -764,6 +764,23 @@ } } }, + "VersionUpgrade41to42": { + "package_info": { + "package_id": "VersionUpgrade41to42", + "package_type": "plugin", + "display_name": "Version Upgrade 4.1 to 4.2", + "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", + "package_version": "1.0.0", + "sdk_version": "6.0.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, "X3DReader": { "package_info": { "package_id": "X3DReader", From 728d8c3141a8ce49f96aa2d553101859c1cc364a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 16:22:54 +0200 Subject: [PATCH 016/994] Add test for VersionUpgrade41to42 --- .../tests/TestVersionUpgrade41To42.py | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py new file mode 100644 index 0000000000..bd7f231b05 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py @@ -0,0 +1,36 @@ +import configparser + +import VersionUpgrade41to42 + +before_update = """[general] +version = 4 +name = Ultimaker 3 +id = Ultimaker 3 + +[metadata] +type = machine + +[containers] +0 = user_profile +1 = quality_changes +2 = quality +3 = material +4 = variant +5 = definition_changes +6 = definition +""" + + +def test_upgrade(): + upgrader = VersionUpgrade41to42.VersionUpgrade41to42() + file_name, new_data = upgrader.upgradeStack(before_update, "whatever") + parser = configparser.ConfigParser(interpolation=None) + parser.read_string(new_data[0]) + assert parser["containers"]["0"] == "user_profile" + assert parser["containers"]["1"] == "quality_changes" + assert parser["containers"]["2"] == "empty_intent" + assert parser["containers"]["3"] == "quality" + assert parser["containers"]["4"] == "material" + assert parser["containers"]["5"] == "variant" + assert parser["containers"]["6"] == "definition_changes" + assert parser["containers"]["7"] == "definition" \ No newline at end of file From d69c4d09793e3fa6b7742166d8bb781e12447d4f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 3 Jun 2019 16:27:39 +0200 Subject: [PATCH 017/994] Fix tests CURA-6543 --- tests/Settings/TestCuraContainerRegistry.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py index 06f3f581ba..2bbc42e0a1 100644 --- a/tests/Settings/TestCuraContainerRegistry.py +++ b/tests/Settings/TestCuraContainerRegistry.py @@ -42,10 +42,10 @@ def test_addContainerExtruderStack(container_registry, definition_container, def container_registry.addContainer(definition_container) container_registry.addContainer(definition_changes_container) - container_stack = UM.Settings.ContainerStack.ContainerStack(stack_id = "Test Extruder Stack") #A container we're going to convert. + container_stack = ExtruderStack("Test Extruder Stack") #A container we're going to convert. container_stack.setMetaDataEntry("type", "extruder_train") #This is now an extruder train. - container_stack.insertContainer(0, definition_container) #Add a definition to it so it doesn't complain. - container_stack.insertContainer(1, definition_changes_container) + container_stack.setDefinition(definition_container) #Add a definition to it so it doesn't complain. + container_stack.setDefinitionChanges(definition_changes_container) mock_super_add_container = unittest.mock.MagicMock() #Takes the role of the Uranium-ContainerRegistry where the resulting containers get registered. with unittest.mock.patch("UM.Settings.ContainerRegistry.ContainerRegistry.addContainer", mock_super_add_container): @@ -61,10 +61,10 @@ def test_addContainerGlobalStack(container_registry, definition_container, defin container_registry.addContainer(definition_container) container_registry.addContainer(definition_changes_container) - container_stack = UM.Settings.ContainerStack.ContainerStack(stack_id = "Test Global Stack") #A container we're going to convert. + container_stack = GlobalStack("Test Global Stack") #A container we're going to convert. container_stack.setMetaDataEntry("type", "machine") #This is now a global stack. - container_stack.insertContainer(0, definition_container) #Must have a definition. - container_stack.insertContainer(1, definition_changes_container) #Must have a definition changes. + container_stack.setDefinition(definition_container) #Must have a definition. + container_stack.setDefinitionChanges(definition_changes_container) #Must have a definition changes. mock_super_add_container = unittest.mock.MagicMock() #Takes the role of the Uranium-ContainerRegistry where the resulting containers get registered. with unittest.mock.patch("UM.Settings.ContainerRegistry.ContainerRegistry.addContainer", mock_super_add_container): From 5163c8f983bda76101b0800a9c695a60dae614d8 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 23 May 2019 16:02:11 +0100 Subject: [PATCH 018/994] Added machine_extruders_share_heater setting and associated machine settings dialog checkbox. --- .../MachineSettingsPrinterTab.qml | 12 ++++++++++++ resources/definitions/fdmprinter.def.json | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 1535301616..d9691c6220 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -314,6 +314,18 @@ Item onGlobalContainerChanged: extruderCountModel.update() } } + + Cura.SimpleCheckBox // "Shared Heater" + { + id: sharedHeaterCheckBox + containerStackId: machineStackId + settingKey: "machine_extruders_share_heater" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Shared Heater") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction + } } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ebbb6a5a3c..366d0f25c8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -375,6 +375,16 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "machine_extruders_share_heater": + { + "label": "Extruders Share Heater", + "description": "Whether the extruders share a single heater rather than each extruder having its own heater.", + "type": "bool", + "default_value": false, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "machine_disallowed_areas": { "label": "Disallowed Areas", @@ -2113,7 +2123,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "material_standby_temperature", "maximum_value_warning": "material_print_temperature", - "enabled": "machine_nozzle_temp_enabled", + "enabled": "machine_nozzle_temp_enabled and not machine_extruders_share_heater", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2128,7 +2138,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "material_standby_temperature", "maximum_value_warning": "material_print_temperature", - "enabled": "machine_nozzle_temp_enabled", + "enabled": "machine_nozzle_temp_enabled and not machine_extruders_share_heater", "settable_per_mesh": false, "settable_per_extruder": true }, From 266cf52cbc3870871890d18d40b17673232be420 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 4 Jun 2019 17:24:34 +0200 Subject: [PATCH 019/994] Add stub for the IntentModel CURA-6534 --- cura/Machines/Models/IntentModel.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 cura/Machines/Models/IntentModel.py diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py new file mode 100644 index 0000000000..5a3f5a974e --- /dev/null +++ b/cura/Machines/Models/IntentModel.py @@ -0,0 +1,17 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Optional +from PyQt5.QtCore.QObject import QObject +from UM.Qt.ListModel import ListModel +from PyQt5.QtCore import Qt + + +class IntentModel(ListModel): + def __init__(self, parent: Optional[QObject] = None) -> None: + super().__init__(parent) + + self._update() + + def _update(self) -> None: + pass \ No newline at end of file From 2e7f8b066a52831c8c97e0ea6f497cba4619795d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 4 Jun 2019 17:32:11 +0200 Subject: [PATCH 020/994] Ensure that the intent model gets populated CURA-6534 --- cura/Machines/Models/IntentModel.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 5a3f5a974e..47657a48e6 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -6,12 +6,31 @@ from PyQt5.QtCore.QObject import QObject from UM.Qt.ListModel import ListModel from PyQt5.QtCore import Qt +from UM.Settings.ContainerRegistry import ContainerRegistry + class IntentModel(ListModel): + NameRole = Qt.UserRole + 1 + IdRole = Qt.UserRole + 2 + def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) + self.addRoleName(self.NameRole, "name") + self.addRoleName(self.IdRole, "id") + + ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) + ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) + self._update() + def _onChanged(self, container): + if container.getMetaDataEntry("type") == "intent": + self._update() + def _update(self) -> None: - pass \ No newline at end of file + new_items = [] + for container in ContainerRegistry.getInstance().findInstanceContainers(type="intent"): + new_items.append({"name": container.getName(), "id": container.getId()}) + + self.setItems(new_items) From 69038c9e757a58c174913a7b17dee0e7a3461b7b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 4 Jun 2019 17:40:58 +0200 Subject: [PATCH 021/994] Added two test intent profiles CURA-6534 --- resources/intent/smooth.inst.cfg | 10 ++++++++++ resources/intent/strong.inst.cfg | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 resources/intent/smooth.inst.cfg create mode 100644 resources/intent/strong.inst.cfg diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg new file mode 100644 index 0000000000..df5d171719 --- /dev/null +++ b/resources/intent/smooth.inst.cfg @@ -0,0 +1,10 @@ +[general] +version = 4 +name = Smooth (TEST INTENT) + +[metadata] +setting_version = 7 +type = intent + +[values] + diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg new file mode 100644 index 0000000000..10f78dff1c --- /dev/null +++ b/resources/intent/strong.inst.cfg @@ -0,0 +1,10 @@ +[general] +version = 4 +name = Strong (TEST INTENT) + +[metadata] +setting_version = 7 +type = intent + +[values] + From 2d8c19203e9f5a02045ba5fbed7b2c8a26459981 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 Jun 2019 09:57:42 +0200 Subject: [PATCH 022/994] Expose intent model to QML CURA-6534 --- cura/CuraApplication.py | 2 ++ cura/Machines/Models/IntentModel.py | 2 +- resources/intent/smooth.inst.cfg | 1 + resources/intent/strong.inst.cfg | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2f0568693f..bec5d7975b 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -61,6 +61,7 @@ from cura.Arranging.Arrange import Arrange from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob from cura.Arranging.ShapeArray import ShapeArray +from cura.Machines.Models.IntentModel import IntentModel from cura.Operations.SetParentOperation import SetParentOperation @@ -1069,6 +1070,7 @@ class CuraApplication(QtApplication): qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0, "CustomQualityProfilesDropDownMenuModel", self.getCustomQualityProfilesDropDownMenuModel) qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel") + qmlRegisterType(IntentModel, "Cura", 1, 6, "IntentModel") qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler") qmlRegisterType(SettingVisibilityPresetsModel, "Cura", 1, 0, "SettingVisibilityPresetsModel") diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 47657a48e6..4a67ae3c87 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from PyQt5.QtCore.QObject import QObject +from PyQt5.QtCore import QObject from UM.Qt.ListModel import ListModel from PyQt5.QtCore import Qt diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index df5d171719..e0ec3713ea 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -1,6 +1,7 @@ [general] version = 4 name = Smooth (TEST INTENT) +definition = fdmprinter [metadata] setting_version = 7 diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index 10f78dff1c..4758841bf7 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -1,6 +1,7 @@ [general] version = 4 name = Strong (TEST INTENT) +definition = fdmprinter [metadata] setting_version = 7 From 35ec70a3cf352ce903ab0c3e35e658f9a6810a90 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 Jun 2019 11:13:32 +0200 Subject: [PATCH 023/994] Add a selector for the intent profile CURA-6534 --- cura/Machines/Models/IntentModel.py | 4 +- cura/Settings/CuraContainerStack.py | 2 +- .../cura_empty_instance_containers.py | 1 + resources/qml/Menus/IntentMenu.qml | 44 +++++++++++++++++ .../Custom/CustomPrintSetup.qml | 48 ++++++++++++++++++- 5 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 resources/qml/Menus/IntentMenu.qml diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 4a67ae3c87..3f480e2eef 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -12,12 +12,14 @@ from UM.Settings.ContainerRegistry import ContainerRegistry class IntentModel(ListModel): NameRole = Qt.UserRole + 1 IdRole = Qt.UserRole + 2 + ContainerRole = Qt.UserRole + 3 def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) self.addRoleName(self.NameRole, "name") self.addRoleName(self.IdRole, "id") + self.addRoleName(self.ContainerRole, "container") ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) @@ -31,6 +33,6 @@ class IntentModel(ListModel): def _update(self) -> None: new_items = [] for container in ContainerRegistry.getInstance().findInstanceContainers(type="intent"): - new_items.append({"name": container.getName(), "id": container.getId()}) + new_items.append({"name": container.getName(), "id": container.getId(), "container": container}) self.setItems(new_items) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index af319ceb51..278bc1dc4f 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -93,7 +93,7 @@ class CuraContainerStack(ContainerStack): # # \param new_intent The new intent container. It is expected to have a "type" metadata entry with the value "intent". def setIntent(self, new_intent: InstanceContainer, postpone_emit: bool = False) -> None: - self.replaceContainer(_ContainerIndexes.Quality, new_intent, postpone_emit=postpone_emit) + self.replaceContainer(_ContainerIndexes.Intent, new_intent, postpone_emit=postpone_emit) ## Get the quality container. # diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index 62b01d32d9..e8a6df8ff1 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -47,6 +47,7 @@ EMPTY_INTENT_CONTAINER_ID = "empty_intent" empty_intent_container = copy.deepcopy(empty_container) empty_intent_container.setMetaDataEntry("id", EMPTY_INTENT_CONTAINER_ID) empty_intent_container.setMetaDataEntry("type", "intent") +empty_intent_container.setName(catalog.i18nc("@info:No intent profile selected", "Default")) # All empty container IDs set diff --git a/resources/qml/Menus/IntentMenu.qml b/resources/qml/Menus/IntentMenu.qml new file mode 100644 index 0000000000..410ab70eb7 --- /dev/null +++ b/resources/qml/Menus/IntentMenu.qml @@ -0,0 +1,44 @@ +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +Menu +{ + id: menu + title: "Intent" + + property int extruderIndex: 0 + + Cura.IntentModel + { + id: intentModel + } + + Instantiator + { + model: intentModel + + MenuItem + { + text: model.name + checkable: true + checked: false + Binding on checked + { + when: Cura.MachineManager.activeStack != null + value: Cura.MachineManager.activeStack.intent == model.container + } + exclusiveGroup: group + onTriggered: Cura.MachineManager.activeStack.intent = model.container + } + + onObjectAdded: menu.insertItem(index, object) + onObjectRemoved: menu.removeItem(object) + } + ExclusiveGroup { id: group } +} diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 98bb5c0405..e6a35455f2 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -3,6 +3,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 +import QtQuick.Controls 1.1 as OldControls import UM 1.3 as UM import Cura 1.0 as Cura @@ -24,12 +25,55 @@ Item anchors { top: parent.top - topMargin: parent.padding + left: parent.left + right: parent.right + margins: parent.padding + } + } + Item + { + id: intent + height: childrenRect.height + + anchors + { + top: globalProfileRow.bottom + topMargin: UM.Theme.getSize("default_margin").height left: parent.left leftMargin: parent.padding right: parent.right rightMargin: parent.padding } + + Label + { + id: intentLabel + anchors + { + top: parent.top + bottom: parent.bottom + left: parent.left + right: intentSelection.left + } + text: catalog.i18nc("@label", "Intent") + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + verticalAlignment: Text.AlignVCenter + } + OldControls.ToolButton + { + id: intentSelection + text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.intent.name : "" + tooltip: text + height: UM.Theme.getSize("print_setup_big_item").height + width: UM.Theme.getSize("print_setup_big_item").width + anchors.right: parent.right + style: UM.Theme.styles.print_setup_header_button + activeFocusOnPress: true + + menu: Cura.IntentMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } + } + } UM.TabRow @@ -40,7 +84,7 @@ Item anchors { - top: globalProfileRow.bottom + top: intent.bottom topMargin: UM.Theme.getSize("default_margin").height left: parent.left leftMargin: parent.padding From 91767cf81f00022d9e7ab091d27d0b161c20507c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 19 Jun 2019 13:12:42 +0200 Subject: [PATCH 024/994] Fix merge conflict --- plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py index 7e65156c0c..8fe718ca83 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py @@ -56,8 +56,4 @@ def getMetaData() -> Dict[str, Any]: def register(app: "Application") -> Dict[str, Any]: -<<<<<<< HEAD - return {"version_upgrade": upgrade} -======= return { "version_upgrade": upgrade } ->>>>>>> master From aea5e50401140d54ee19908c0c205d501bf98d90 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 19 Jun 2019 13:14:02 +0200 Subject: [PATCH 025/994] Stacks are upgraded to a higher version number So indicate to the plug-in metadata that they are. --- plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py index 8fe718ca83..4f94cd56fa 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py @@ -15,8 +15,8 @@ def getMetaData() -> Dict[str, Any]: "version_upgrade": { # From To Upgrade function ("preferences", 6000007): ("preferences", 6000008, upgrade.upgradePreferences), - ("machine_stack", 4000007): ("machine_stack", 4000008, upgrade.upgradeStack), - ("extruder_train", 4000007): ("extruder_train", 4000008, upgrade.upgradeStack), + ("machine_stack", 4000007): ("machine_stack", 5000008, upgrade.upgradeStack), + ("extruder_train", 4000007): ("extruder_train", 5000008, upgrade.upgradeStack), ("definition_changes", 4000007): ("definition_changes", 4000008, upgrade.upgradeInstanceContainer), ("quality_changes", 4000007): ("quality_changes", 4000008, upgrade.upgradeInstanceContainer), ("quality", 4000007): ("quality", 4000008, upgrade.upgradeInstanceContainer), From fa65875824138f20d3edf9a0409842a97aed7c46 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 19 Jun 2019 14:29:19 +0200 Subject: [PATCH 026/994] Add psuedocode/boilerplate for intent manager This won't run. Don't try to import this class yet. It's outlining what we need to implement to get intents per stack. It does no form of caching at this point. Build first, optimise later, right. Contributes to issue CURA-6091. --- cura/Machines/Models/IntentCategoryModel.py | 14 +++ cura/Settings/IntentManager.py | 95 +++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 cura/Machines/Models/IntentCategoryModel.py create mode 100644 cura/Settings/IntentManager.py diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py new file mode 100644 index 0000000000..fb93c771a0 --- /dev/null +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -0,0 +1,14 @@ +#Copyright (c) 2019 Ultimaker B.V. +#Cura is released under the terms of the LGPLv3 or higher. + +from UM.Qt.ListModel import ListModel +from cura.Settings.IntentManager import IntentManager + +class IntentCategoryModel(ListModel): + def __init__(self, intent_category: str): + self._intent_category = intent_category + + def update(self): + available_intents = IntentManager.getInstance().currentAvailableIntents() + result = filter(lambda intent: intent.getMetaDataEntry("intent_category") == self._intent_category, available_intents) + super().update(result) \ No newline at end of file diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py new file mode 100644 index 0000000000..3fb2657b00 --- /dev/null +++ b/cura/Settings/IntentManager.py @@ -0,0 +1,95 @@ +#Copyright (c) 2019 Ultimaker B.V. +#Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import pyqtProperty, pyqtSignal +from typing import List, Tuple, TYPE_CHECKING +from cura.CuraApplication import CuraApplication +from cura.Machines.QualityManager import QualityManager +from cura.Settings.MachineManager import MachineManager +from UM.Settings.ContainerRegistry import ContainerRegistry + +if TYPE_CHECKING: + from UM.Settings.InstanceContainer import InstanceContainer + +## Front-end for querying which intents are available for a certain +# configuration. +# +# CURRENTLY THIS CLASS CONTAINS ONLY SOME PSEUDOCODE OF WHAT WE ARE SUPPOSED +# TO IMPLEMENT. +class IntentManager: + __instance = None + + def __init__(self) -> None: + MachineManager.activeStackChanged.connect(self.configurationChanged) + self.configurationChanged.connect(self.selectDefaultIntent) + pass + + @classmethod + def getInstance(cls): + if not cls.__instance: + cls.__instance = IntentManager() + return cls.__instance + + configurationChanged = pyqtSignal + + def intentMetadatas(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: + #Return list of available intent profiles for any configuration. + #Use ContainerRegistry.findContainersMetadata for this. + return [] + + def intentCategories(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: + categories = set() + for intent in self.intentMetadatas(definition_id, nozzle_id, material_id): + categories.add(intent["intent_category"]) + return list(categories) + + ## List of intents to be displayed in the interface. + # + # For the interface this will have to be broken up into the different + # intent categories. That is up to the model there. + # + # \return A list of tuples of intent_category and quality_type. The actual + # instance may vary per extruder. + @pyqtProperty("QVariantList", notify = configurationChanged) + def currentAvailableIntents(self) -> List[Tuple[str, str]]: + final_intent_ids = {metadata["id"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} #All intents that match the global stack. + for extruder in all_extruders: + extruder_intent_ids = {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, extruder_nozzle_id, extruder_material_id)} + final_intent_ids = final_intent_ids.intersection(extruder_intent_ids) + + result = set() + for intent_id in final_intent_ids: + intent = ContainerRegistry.getInstance().findContainers(id = intent_id)[0] + result.add((intent.getMetaDataEntry("intent_category"), intent.getMetaDataEntry("quality_type"))) + return list(result) + + ## List of intent categories to be displayed in the interface. + @pyqtProperty("QVariantList", notify = configurationChanged) + def currentAvailableIntentCategories(self) -> List[str]: + final_intent_categories = {metadata["intent_category"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} + for extruder in all_extruders: + final_intent_categories = final_intent_categories.intersection(self.intentCategories()) + return list(final_intent_categories) + + def defaultIntent(self) -> Tuple[str, str]: + default_quality_type = QualityManager.getInstance().getDefaultQualityType().quality_type + for intent in self.currentAvailableIntents(): + if intent.getMetaDataEntry("intent_category") == "default" and intent.getMetaDataEntry("quality_type") == default_quality_type: + return intent + else: #Fallback: Preferred quality type is not available for default category. + for intent in self.currentAvailableIntents(): + if intent.getMetaDataEntry("intent_category") == "default": + return intent + else: #Fallback: No default category. + if self.currentAvailableIntents(): + return self.currentAvailableIntents()[0] + else: + return CuraApplication.empty_intent_container + + def selectIntent(self, intent_category, quality_type): + for extruder in all_extruders: + extruder_stack.intent = ContainerRegistry.getInstance().findContainers(type = "intent", definition = current_definition_id, variant = extruder_nozzle_id, material = extruder_material_id)[0] + + def selectDefaultIntent(self) -> None: + category, quality_type = self.defaultIntent() + self.selectIntent(category, quality_type) \ No newline at end of file From 64e3a99ad307bd417d9413e300a2393fc02eac10 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 19 Jun 2019 16:52:54 +0200 Subject: [PATCH 027/994] Also select correct quality level on the stack when changing intent Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 3fb2657b00..3c5a447866 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -89,6 +89,7 @@ class IntentManager: def selectIntent(self, intent_category, quality_type): for extruder in all_extruders: extruder_stack.intent = ContainerRegistry.getInstance().findContainers(type = "intent", definition = current_definition_id, variant = extruder_nozzle_id, material = extruder_material_id)[0] + extruder_stack.quality = ContainerRegistry.getInstance().findContainers(type = "quality", quality_type = quality_type) def selectDefaultIntent(self) -> None: category, quality_type = self.defaultIntent() From c83b9d158ba5aed644fa0315eabbfdbce83d3618 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 14:02:34 +0200 Subject: [PATCH 028/994] Final implementation of intentMetadatas and intentCategories Instead of pseudocode. Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 19 +++++++++++++------ resources/intent/strong.inst.cfg | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 3c5a447866..bae114fd97 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -2,7 +2,7 @@ #Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtProperty, pyqtSignal -from typing import List, Tuple, TYPE_CHECKING +from typing import Any, Dict, List, Tuple, TYPE_CHECKING from cura.CuraApplication import CuraApplication from cura.Machines.QualityManager import QualityManager from cura.Settings.MachineManager import MachineManager @@ -24,6 +24,7 @@ class IntentManager: self.configurationChanged.connect(self.selectDefaultIntent) pass + ## This class is a singleton. @classmethod def getInstance(cls): if not cls.__instance: @@ -32,15 +33,22 @@ class IntentManager: configurationChanged = pyqtSignal - def intentMetadatas(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: - #Return list of available intent profiles for any configuration. - #Use ContainerRegistry.findContainersMetadata for this. - return [] + ## Gets the metadata dictionaries of all intent profiles for a given + # configuration. + # + # \param definition_id: ID of the printer. + # \return A list of metadata dictionaries matching the search criteria, or + # an empty list if nothing was found. + def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: + registry = ContainerRegistry.getInstance() + return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) + ## def intentCategories(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: categories = set() for intent in self.intentMetadatas(definition_id, nozzle_id, material_id): categories.add(intent["intent_category"]) + categories.add("default") #The "empty" intent is not an actual profile specific to the configuration but we do want it to appear in the categories list. return list(categories) ## List of intents to be displayed in the interface. @@ -50,7 +58,6 @@ class IntentManager: # # \return A list of tuples of intent_category and quality_type. The actual # instance may vary per extruder. - @pyqtProperty("QVariantList", notify = configurationChanged) def currentAvailableIntents(self) -> List[Tuple[str, str]]: final_intent_ids = {metadata["id"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} #All intents that match the global stack. for extruder in all_extruders: diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index 4758841bf7..702778d598 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -6,6 +6,10 @@ definition = fdmprinter [metadata] setting_version = 7 type = intent +intent_category = engineering +quality_type = draft +material = generic_abs +variant = AA 0.4 [values] From 28e2569c86bbb9776dccbc0058d2628a8575f284 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 14:48:18 +0200 Subject: [PATCH 029/994] Implement complete code for currentAvailableIntents Slightly more complex than the original pseudocode was indicating: It needs to filter on the available quality types first in order to only show the quality types that can be printed with all extruders, but still show the union of all intents for those quality types. Contributes to issue CURA-6091. --- cura/Machines/QualityManager.py | 4 ++-- cura/Settings/IntentManager.py | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 7da4f4f0d6..b4f8b8f679 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -194,9 +194,9 @@ class QualityManager(QObject): return quality_changes_group_dict # - # Gets all quality groups for the given machine. Both available and none available ones will be included. + # Gets all quality groups for the given machine. Both available and unavailable ones will be included. # It returns a dictionary with "quality_type"s as keys and "QualityGroup"s as values. - # Whether a QualityGroup is available can be unknown via the field QualityGroup.is_available. + # Whether a QualityGroup is available can be known via the field QualityGroup.is_available. # For more details, see QualityGroup. # def getQualityGroups(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index bae114fd97..98c4836d48 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -5,6 +5,7 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal from typing import Any, Dict, List, Tuple, TYPE_CHECKING from cura.CuraApplication import CuraApplication from cura.Machines.QualityManager import QualityManager +from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.MachineManager import MachineManager from UM.Settings.ContainerRegistry import ContainerRegistry @@ -59,15 +60,22 @@ class IntentManager: # \return A list of tuples of intent_category and quality_type. The actual # instance may vary per extruder. def currentAvailableIntents(self) -> List[Tuple[str, str]]: - final_intent_ids = {metadata["id"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} #All intents that match the global stack. - for extruder in all_extruders: - extruder_intent_ids = {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, extruder_nozzle_id, extruder_material_id)} - final_intent_ids = final_intent_ids.intersection(extruder_intent_ids) + application = CuraApplication.getInstance() + quality_groups = application.getQualityManager().getQualityGroups(application.getGlobalContainerStack()) + available_quality_types = {quality_group.quality_type for quality_group in quality_groups if quality_group.node_for_global is not None} + + final_intent_ids = set() + global_stack = application.getGlobalContainerStack() + current_definition_id = global_stack.definition.getMetaDataEntry("id") + for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + nozzle_name = extruder_stack.variant.getMetaDataEntry("name") + material_id = extruder_stack.material.getMetaDataEntry("base_file") + final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} result = set() for intent_id in final_intent_ids: - intent = ContainerRegistry.getInstance().findContainers(id = intent_id)[0] - result.add((intent.getMetaDataEntry("intent_category"), intent.getMetaDataEntry("quality_type"))) + intent_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = intent_id)[0] + result.add((intent_metadata["intent_category"], intent_metadata["quality_type"])) return list(result) ## List of intent categories to be displayed in the interface. From 2b775497b5b21ac7080a03296bba30146582f0c0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 15:06:24 +0200 Subject: [PATCH 030/994] Implement complete code for currentAvailableIntentCategories There is an inconsistency here with the available quality types. It's documented in the function for now. Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 98c4836d48..34b0d8cf68 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -78,12 +78,21 @@ class IntentManager: result.add((intent_metadata["intent_category"], intent_metadata["quality_type"])) return list(result) - ## List of intent categories to be displayed in the interface. - @pyqtProperty("QVariantList", notify = configurationChanged) + ## List of intent categories available in either of the extruders. + # + # This is purposefully inconsistent with the way that the quality types + # are listed. The quality types will show all quality types available in + # the printer using any configuration. This will only list the intent + # categories that are available using the current configuration (but the + # union over the extruders). def currentAvailableIntentCategories(self) -> List[str]: - final_intent_categories = {metadata["intent_category"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} - for extruder in all_extruders: - final_intent_categories = final_intent_categories.intersection(self.intentCategories()) + global_stack = CuraApplication.getInstance().getGlobalContainerStack() + current_definition_id = global_stack.definition.getMetaDataEntry("id") + final_intent_categories = set() + for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + nozzle_name = extruder_stack.variant.getMetaDataEntry("name") + material_id = extruder_stack.material.getMetaDataEntry("base_file") + final_intent_categories |= self.intentCategories(current_definition_id, nozzle_name, material_id) return list(final_intent_categories) def defaultIntent(self) -> Tuple[str, str]: From 744fbec38c1ee7ddc9653c4398723f16744ce894 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 15:12:53 +0200 Subject: [PATCH 031/994] Implement defaultIntent We keep this function in as a way of documentation. Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 34b0d8cf68..528a060380 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -95,20 +95,11 @@ class IntentManager: final_intent_categories |= self.intentCategories(current_definition_id, nozzle_name, material_id) return list(final_intent_categories) - def defaultIntent(self) -> Tuple[str, str]: - default_quality_type = QualityManager.getInstance().getDefaultQualityType().quality_type - for intent in self.currentAvailableIntents(): - if intent.getMetaDataEntry("intent_category") == "default" and intent.getMetaDataEntry("quality_type") == default_quality_type: - return intent - else: #Fallback: Preferred quality type is not available for default category. - for intent in self.currentAvailableIntents(): - if intent.getMetaDataEntry("intent_category") == "default": - return intent - else: #Fallback: No default category. - if self.currentAvailableIntents(): - return self.currentAvailableIntents()[0] - else: - return CuraApplication.empty_intent_container + ## The intent that gets selected by default when no intent is available for + # the configuration, an extruder can't match the intent that the user + # selects, or just when creating a new printer. + def defaultIntent(self) -> InstanceContainer: + return CuraApplication.getInstance().empty_intent_container def selectIntent(self, intent_category, quality_type): for extruder in all_extruders: From aa0bf2f6ba92f59ff6626d5e6d2333c65ad2ccd9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 15:27:07 +0200 Subject: [PATCH 032/994] Implement selectIntent Selects a certain intent profile, applying it to the stack. Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 528a060380..876d41a1b4 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -101,10 +101,21 @@ class IntentManager: def defaultIntent(self) -> InstanceContainer: return CuraApplication.getInstance().empty_intent_container - def selectIntent(self, intent_category, quality_type): - for extruder in all_extruders: - extruder_stack.intent = ContainerRegistry.getInstance().findContainers(type = "intent", definition = current_definition_id, variant = extruder_nozzle_id, material = extruder_material_id)[0] - extruder_stack.quality = ContainerRegistry.getInstance().findContainers(type = "quality", quality_type = quality_type) + ## Apply intent on the stacks. + def selectIntent(self, intent_category, quality_type) -> None: + application = CuraApplication.getInstance() + global_stack = application.getGlobalContainerStack() + current_definition_id = global_stack.definition.getMetaDataEntry("id") + for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + nozzle_name = extruder_stack.variant.getMetaDataEntry("name") + material_id = extruder_stack.material.getMetaDataEntry("base_file") + intent = ContainerRegistry.getInstance().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) + if intent: + extruder_stack.intent = intent[0] + else: + extruder_stack.intent = self.defaultIntent() + + application.getMachineManager().setQualityGroupByQualityType(quality_type) def selectDefaultIntent(self) -> None: category, quality_type = self.defaultIntent() From 96c111553a111229d5e10bc2b6f86c0eb62cd412 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 15:30:24 +0200 Subject: [PATCH 033/994] Implement selectDefaultIntent Bit of a weird one. Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 876d41a1b4..5af32b2154 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -118,5 +118,5 @@ class IntentManager: application.getMachineManager().setQualityGroupByQualityType(quality_type) def selectDefaultIntent(self) -> None: - category, quality_type = self.defaultIntent() - self.selectIntent(category, quality_type) \ No newline at end of file + for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + extruder_stack.intent = self.defaultIntent() \ No newline at end of file From 53c387f34dfeadf1a8232939ffc6d55fcdbe487f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 20 Jun 2019 16:04:37 +0200 Subject: [PATCH 034/994] Add TestIntentManager (mostly a dummy file), prevents future conflicts. [CURA-6091] --- tests/TestIntentManager.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/TestIntentManager.py diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py new file mode 100644 index 0000000000..a30de04565 --- /dev/null +++ b/tests/TestIntentManager.py @@ -0,0 +1,38 @@ +from unittest.mock import MagicMock, patch + +import pytest + +from UM.Settings.ContainerRegistry import ContainerRegistry +from cura.Settings.ExtruderManager import ExtruderManager +from cura.Settings.MachineManager import MachineManager +from cura.Settings.IntentManager import IntentManager + +@pytest.fixture() +def global_stack(): + return MagicMock(name="Global Stack") + +@pytest.fixture() +def container_registry() -> ContainerRegistry: + return MagicMock(name = "ContainerRegistry") + + +@pytest.fixture() +def extruder_manager(application, container_registry) -> ExtruderManager: + if ExtruderManager.getInstance() is not None: + # Reset the data + ExtruderManager._ExtruderManager__instance = None + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = ExtruderManager() + return manager + + +@pytest.fixture() +def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: + application.getExtruderManager = MagicMock(return_value = extruder_manager) + application.getGlobalContainerStack = MagicMock(return_value = global_stack) + with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = MachineManager(application) + + return manager From ede6efb799fc521eefbc44f5c6b90441fa0b1203 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 20 Jun 2019 15:42:35 +0200 Subject: [PATCH 035/994] Missing documentation Contributes to issue CURA-6091. --- cura/Settings/IntentManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 5af32b2154..4cc167a3cd 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -85,6 +85,8 @@ class IntentManager: # the printer using any configuration. This will only list the intent # categories that are available using the current configuration (but the # union over the extruders). + # \return List of all categories in the current configurations of all + # extruders. def currentAvailableIntentCategories(self) -> List[str]: global_stack = CuraApplication.getInstance().getGlobalContainerStack() current_definition_id = global_stack.definition.getMetaDataEntry("id") @@ -117,6 +119,7 @@ class IntentManager: application.getMachineManager().setQualityGroupByQualityType(quality_type) + ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): extruder_stack.intent = self.defaultIntent() \ No newline at end of file From fd80a6c1b6edc5b649e9c3a069ef64f9ad710d66 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 20 Jun 2019 17:48:52 +0200 Subject: [PATCH 036/994] Change some leftover pseudo-code to real code. Part of CURA-6091. --- cura/Settings/IntentManager.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 5af32b2154..66778b383c 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -1,13 +1,14 @@ #Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import pyqtProperty, pyqtSignal +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal from typing import Any, Dict, List, Tuple, TYPE_CHECKING from cura.CuraApplication import CuraApplication from cura.Machines.QualityManager import QualityManager from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.MachineManager import MachineManager from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: from UM.Settings.InstanceContainer import InstanceContainer @@ -17,11 +18,12 @@ if TYPE_CHECKING: # # CURRENTLY THIS CLASS CONTAINS ONLY SOME PSEUDOCODE OF WHAT WE ARE SUPPOSED # TO IMPLEMENT. -class IntentManager: +class IntentManager(QObject): __instance = None def __init__(self) -> None: - MachineManager.activeStackChanged.connect(self.configurationChanged) + super().__init__() + CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.configurationChanged) self.configurationChanged.connect(self.selectDefaultIntent) pass @@ -32,7 +34,7 @@ class IntentManager: cls.__instance = IntentManager() return cls.__instance - configurationChanged = pyqtSignal + configurationChanged = pyqtSignal() ## Gets the metadata dictionaries of all intent profiles for a given # configuration. @@ -41,7 +43,7 @@ class IntentManager: # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: - registry = ContainerRegistry.getInstance() + registry = CuraApplication.getInstance().getContainerRegistry() return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) ## @@ -74,7 +76,7 @@ class IntentManager: result = set() for intent_id in final_intent_ids: - intent_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = intent_id)[0] + intent_metadata = application.getContainerRegistry().findContainersMetadata(id = intent_id)[0] result.add((intent_metadata["intent_category"], intent_metadata["quality_type"])) return list(result) @@ -109,7 +111,7 @@ class IntentManager: for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") - intent = ContainerRegistry.getInstance().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) + intent = application.getContainerRegistry().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) if intent: extruder_stack.intent = intent[0] else: From f03c239041bdc48c8e85103781f236f3486672d7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 20 Jun 2019 17:57:15 +0200 Subject: [PATCH 037/994] Update some documentation. [CURA-6091] --- cura/Settings/IntentManager.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index b7016c8114..9b0b5ff062 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -39,14 +39,22 @@ class IntentManager(QObject): ## Gets the metadata dictionaries of all intent profiles for a given # configuration. # - # \param definition_id: ID of the printer. + # \param definition_id ID of the printer. + # \param nozzle_name Name of the nozzle. + # \param material_id ID of the material. # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: registry = CuraApplication.getInstance().getContainerRegistry() return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) - ## + ## Collects and returns all intent categories available for the given + # parameters. Note that the 'default' category is always available. + # + # \param definition_id ID of the printer. + # \param nozzle_name Name of the nozzle. + # \param material_id ID of the material. + # \return A set of intent category names. def intentCategories(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: categories = set() for intent in self.intentMetadatas(definition_id, nozzle_id, material_id): From f339686c499de00a8cd17e7a10d0a7b221dfea8f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 21 Jun 2019 12:45:44 +0200 Subject: [PATCH 038/994] Implement category model Not just pseudocode. However this code is not yet tested. Contributes to issue CURA-6091. --- cura/Machines/Models/IntentCategoryModel.py | 41 +++++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index fb93c771a0..789050e391 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -1,14 +1,47 @@ #Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. -from UM.Qt.ListModel import ListModel -from cura.Settings.IntentManager import IntentManager +from PyQt5.QtCore import Qt +import collections +from cura.Settings.IntentManager import IntentManager +from UM.Qt.ListModel import ListModel + +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") + +## Lists the intent categories that are available for the current printer +# configuration. class IntentCategoryModel(ListModel): + NameRole = Qt.UserRole + 1 + IntentCategoryRole = Qt.UserRole + 2 + WeightRole = Qt.UserRole + 3 + + #Translations to user-visible string. Ordered by weight. + #TODO: Create a solution for this name and weight to be used dynamically. + name_translation = collections.OrderedDict() + name_translation["default"] = catalog.i18nc("@label", "Default") + name_translation["engineering"] = catalog.i18nc("@label", "Engineering") + name_translation["smooth"] = catalog.i18nc("@label", "Smooth") + + ## Creates a new model for a certain intent category. + # \param The category to list the intent profiles for. def __init__(self, intent_category: str): + super().__init__() self._intent_category = intent_category + self.addRoleName(self.NameRole, "name") + self.addRoleName(self.IntentCategoryRole, "intent_category") + self.addRoleName(self.WeightRole, "weight") + + ## Updates the list of intents. def update(self): - available_intents = IntentManager.getInstance().currentAvailableIntents() - result = filter(lambda intent: intent.getMetaDataEntry("intent_category") == self._intent_category, available_intents) + available_categories = IntentManager.getInstance().currentAvailableIntentCategories() + result = [] + for category in available_categories: + result.append({ + "name": self.name_translation.get(category, catalog.i18nc("@label", "Unknown")), + "intent_category": category, + "weight": list(self.name_translation.items()).index(category) + }) super().update(result) \ No newline at end of file From 0f9de9935e8ce17febc0dc180a1be2ff416ca3ad Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 21 Jun 2019 14:37:10 +0200 Subject: [PATCH 039/994] Add unit-test for .intentCategories Part of CURA-6091. --- tests/TestIntentManager.py | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index a30de04565..519fa49994 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -12,9 +12,16 @@ def global_stack(): return MagicMock(name="Global Stack") @pytest.fixture() -def container_registry() -> ContainerRegistry: - return MagicMock(name = "ContainerRegistry") +def container_registry(application, global_stack) -> ContainerRegistry: + result = MagicMock() + mocked_metadata = [{"id": "um3_aa4_pla_smooth", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "smooth"}, + {"id": "um3_aa4_pla_strong", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "strong"}] + result.findContainersMetadata = MagicMock(return_value = mocked_metadata) + result.findContainerStacks = MagicMock(return_value = [global_stack]) + application.getContainerRegistry = MagicMock(return_value = result) + + return result @pytest.fixture() def extruder_manager(application, container_registry) -> ExtruderManager: @@ -32,7 +39,28 @@ def extruder_manager(application, container_registry) -> ExtruderManager: def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: application.getExtruderManager = MagicMock(return_value = extruder_manager) application.getGlobalContainerStack = MagicMock(return_value = global_stack) - with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): manager = MachineManager(application) return manager + +# TODO: maybe put some definitions above in common file because they copy the ones in TestMachineManager (also there). + +@pytest.fixture() +def intent_manager(application, extruder_manager, machine_manager, container_registry, global_stack) -> IntentManager: + application.getExtruderManager = MagicMock(return_value = extruder_manager) + application.getGlobalContainerStack = MagicMock(return_value = global_stack) + application.getMachineManager = MagicMock(return_value = machine_manager) + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = IntentManager() + + return manager + +def test_intentCategories(application, intent_manager, container_registry): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] + assert "default" in categories, "default should always be in categories" + assert "strong" in categories, "strong should be in categories" + assert "smooth" in categories, "smooth should be in categories" From 02516f0f477e5c4bf1da16c7698b3df2616b6bc2 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 21 Jun 2019 14:58:55 +0200 Subject: [PATCH 040/994] Refactor: Move common fixtures to 'conftest'. Part of CURA-6091. --- tests/TestIntentManager.py | 46 ++++--------------------------------- tests/TestMachineManager.py | 36 ----------------------------- tests/conftest.py | 39 +++++++++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 80 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 519fa49994..01f8cb310b 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -2,50 +2,8 @@ from unittest.mock import MagicMock, patch import pytest -from UM.Settings.ContainerRegistry import ContainerRegistry -from cura.Settings.ExtruderManager import ExtruderManager -from cura.Settings.MachineManager import MachineManager from cura.Settings.IntentManager import IntentManager -@pytest.fixture() -def global_stack(): - return MagicMock(name="Global Stack") - -@pytest.fixture() -def container_registry(application, global_stack) -> ContainerRegistry: - result = MagicMock() - mocked_metadata = [{"id": "um3_aa4_pla_smooth", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "smooth"}, - {"id": "um3_aa4_pla_strong", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "strong"}] - result.findContainersMetadata = MagicMock(return_value = mocked_metadata) - result.findContainerStacks = MagicMock(return_value = [global_stack]) - - application.getContainerRegistry = MagicMock(return_value = result) - - return result - -@pytest.fixture() -def extruder_manager(application, container_registry) -> ExtruderManager: - if ExtruderManager.getInstance() is not None: - # Reset the data - ExtruderManager._ExtruderManager__instance = None - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - manager = ExtruderManager() - return manager - - -@pytest.fixture() -def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: - application.getExtruderManager = MagicMock(return_value = extruder_manager) - application.getGlobalContainerStack = MagicMock(return_value = global_stack) - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - manager = MachineManager(application) - - return manager - -# TODO: maybe put some definitions above in common file because they copy the ones in TestMachineManager (also there). - @pytest.fixture() def intent_manager(application, extruder_manager, machine_manager, container_registry, global_stack) -> IntentManager: application.getExtruderManager = MagicMock(return_value = extruder_manager) @@ -58,6 +16,10 @@ def intent_manager(application, extruder_manager, machine_manager, container_reg return manager def test_intentCategories(application, intent_manager, container_registry): + mocked_metadata = [{"id": "um3_aa4_pla_smooth", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "smooth"}, + {"id": "um3_aa4_pla_strong", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "strong"}] + container_registry.findContainersMetadata = MagicMock(return_value=mocked_metadata) + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py index b1e155aa4f..e91cffb172 100644 --- a/tests/TestMachineManager.py +++ b/tests/TestMachineManager.py @@ -2,42 +2,6 @@ from unittest.mock import MagicMock, patch import pytest -from UM.Settings.ContainerRegistry import ContainerRegistry -from cura.Settings.ExtruderManager import ExtruderManager -from cura.Settings.MachineManager import MachineManager - - -@pytest.fixture() -def global_stack(): - return MagicMock(name="Global Stack") - -@pytest.fixture() -def container_registry() -> ContainerRegistry: - return MagicMock(name = "ContainerRegistry") - - -@pytest.fixture() -def extruder_manager(application, container_registry) -> ExtruderManager: - if ExtruderManager.getInstance() is not None: - # Reset the data - ExtruderManager._ExtruderManager__instance = None - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - manager = ExtruderManager() - return manager - - -@pytest.fixture() -def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: - application.getExtruderManager = MagicMock(return_value = extruder_manager) - application.getGlobalContainerStack = MagicMock(return_value = global_stack) - with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - manager = MachineManager(application) - - return manager - - def test_setActiveMachine(machine_manager): registry = MagicMock() diff --git a/tests/conftest.py b/tests/conftest.py index 7f46c202b3..876fb4f541 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ # The purpose of this class is to create fixtures or methods that can be shared among all tests. -import unittest.mock +from unittest.mock import MagicMock, patch import pytest # Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import Arcus and Savitar first! @@ -13,16 +13,51 @@ from UM.Qt.QtApplication import QtApplication # QtApplication import is require # Even though your IDE says these files are not used, don't believe it. It's lying. They need to be there. from cura.CuraApplication import CuraApplication +from cura.Settings.ExtruderManager import ExtruderManager +from cura.Settings.MachineManager import MachineManager from cura.UI.MachineActionManager import MachineActionManager +from UM.Settings.ContainerRegistry import ContainerRegistry # Create a CuraApplication object that will be shared among all tests. It needs to be initialized. # Since we need to use it more that once, we create the application the first time and use its instance afterwards. @pytest.fixture() def application() -> CuraApplication: - app = unittest.mock.MagicMock() + app = MagicMock() return app # Returns a MachineActionManager instance. @pytest.fixture() def machine_action_manager(application) -> MachineActionManager: return MachineActionManager(application) + +@pytest.fixture() +def global_stack(): + return MagicMock(name="Global Stack") + +@pytest.fixture() +def container_registry(application, global_stack) -> ContainerRegistry: + result = MagicMock() + result.findContainerStacks = MagicMock(return_value = [global_stack]) + application.getContainerRegistry = MagicMock(return_value = result) + return result + +@pytest.fixture() +def extruder_manager(application, container_registry) -> ExtruderManager: + if ExtruderManager.getInstance() is not None: + # Reset the data + ExtruderManager._ExtruderManager__instance = None + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = ExtruderManager() + return manager + + +@pytest.fixture() +def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: + application.getExtruderManager = MagicMock(return_value = extruder_manager) + application.getGlobalContainerStack = MagicMock(return_value = global_stack) + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = MachineManager(application) + + return manager From 308fcb6b9f60c6b55095e0f63af694a83867a50a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 21 Jun 2019 15:39:27 +0200 Subject: [PATCH 041/994] Fix typing for IntentManager Part of CURA-6091. --- cura/Settings/IntentManager.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 9b0b5ff062..1a38f8b78a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -2,7 +2,7 @@ #Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal -from typing import Any, Dict, List, Tuple, TYPE_CHECKING +from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING from cura.CuraApplication import CuraApplication from cura.Machines.QualityManager import QualityManager from cura.Settings.ExtruderManager import ExtruderManager @@ -74,15 +74,17 @@ class IntentManager(QObject): quality_groups = application.getQualityManager().getQualityGroups(application.getGlobalContainerStack()) available_quality_types = {quality_group.quality_type for quality_group in quality_groups if quality_group.node_for_global is not None} - final_intent_ids = set() + final_intent_ids = set() #type: Set[str] global_stack = application.getGlobalContainerStack() + if global_stack is None: + return [("default", "normal")] current_definition_id = global_stack.definition.getMetaDataEntry("id") for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} - result = set() + result = set() #type: Set[Tuple[str, str]] for intent_id in final_intent_ids: intent_metadata = application.getContainerRegistry().findContainersMetadata(id = intent_id)[0] result.add((intent_metadata["intent_category"], intent_metadata["quality_type"])) @@ -99,12 +101,14 @@ class IntentManager(QObject): # extruders. def currentAvailableIntentCategories(self) -> List[str]: global_stack = CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return ["default"] current_definition_id = global_stack.definition.getMetaDataEntry("id") - final_intent_categories = set() + final_intent_categories = set() #type: Set[str] for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") - final_intent_categories |= self.intentCategories(current_definition_id, nozzle_name, material_id) + final_intent_categories.update(self.intentCategories(current_definition_id, nozzle_name, material_id)) return list(final_intent_categories) ## The intent that gets selected by default when no intent is available for @@ -117,6 +121,8 @@ class IntentManager(QObject): def selectIntent(self, intent_category, quality_type) -> None: application = CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() + if global_stack is None: + return current_definition_id = global_stack.definition.getMetaDataEntry("id") for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") @@ -132,4 +138,4 @@ class IntentManager(QObject): ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): - extruder_stack.intent = self.defaultIntent() \ No newline at end of file + extruder_stack.intent = self.defaultIntent() From 9e3f3c194cea1334d05c6945475fb5eb137c1ce0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 25 Jun 2019 18:00:58 +0200 Subject: [PATCH 042/994] Small refactor: Dont retrieve global-stack twice. Part of CURA-6091 --- cura/Settings/IntentManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 1a38f8b78a..c3fb41a0de 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -71,13 +71,13 @@ class IntentManager(QObject): # instance may vary per extruder. def currentAvailableIntents(self) -> List[Tuple[str, str]]: application = CuraApplication.getInstance() - quality_groups = application.getQualityManager().getQualityGroups(application.getGlobalContainerStack()) - available_quality_types = {quality_group.quality_type for quality_group in quality_groups if quality_group.node_for_global is not None} - - final_intent_ids = set() #type: Set[str] global_stack = application.getGlobalContainerStack() if global_stack is None: return [("default", "normal")] + quality_groups = application.getQualityManager().getQualityGroups(global_stack) + available_quality_types = {quality_group.quality_type for quality_group in quality_groups if quality_group.node_for_global is not None} + + final_intent_ids = set() #type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") From e8a1c68d92d58bb7713fb17a7de7ec5e4cc79ccf Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 27 Jun 2019 17:07:26 +0200 Subject: [PATCH 043/994] Added (partial) test for 'currentAvailableIntents'. part of CURA-6091 --- cura/Settings/IntentManager.py | 8 ++-- tests/TestIntentManager.py | 78 +++++++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c3fb41a0de..a5d71a918d 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -1,13 +1,10 @@ #Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal +from PyQt5.QtCore import QObject, pyqtSignal from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING from cura.CuraApplication import CuraApplication -from cura.Machines.QualityManager import QualityManager from cura.Settings.ExtruderManager import ExtruderManager -from cura.Settings.MachineManager import MachineManager -from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: @@ -75,7 +72,8 @@ class IntentManager(QObject): if global_stack is None: return [("default", "normal")] quality_groups = application.getQualityManager().getQualityGroups(global_stack) - available_quality_types = {quality_group.quality_type for quality_group in quality_groups if quality_group.node_for_global is not None} + available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} + # available_quality_types could just be 'quality_group.keys()', except for that the node_for_global may be None final_intent_ids = set() #type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 01f8cb310b..8b6a88b3b8 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -1,24 +1,45 @@ from unittest.mock import MagicMock, patch import pytest +from typing import Any, Dict, List from cura.Settings.IntentManager import IntentManager +from cura.Machines.QualityGroup import QualityGroup +from cura.Machines.QualityManager import QualityManager + +from tests.Settings.MockContainer import MockContainer @pytest.fixture() -def intent_manager(application, extruder_manager, machine_manager, container_registry, global_stack) -> IntentManager: +def quality_manager(application, container_registry, global_stack) -> QualityManager: + application.getGlobalContainerStack = MagicMock(return_value = global_stack) + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = QualityManager(application) + return manager + + +@pytest.fixture() +def intent_manager(application, extruder_manager, machine_manager, quality_manager, container_registry, global_stack) -> IntentManager: application.getExtruderManager = MagicMock(return_value = extruder_manager) application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getMachineManager = MagicMock(return_value = machine_manager) + application.getQualityManager = MagicMock(return_value = quality_manager) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): manager = IntentManager() - return manager + +mocked_intent_metadata = [ + {"id": "um3_aa4_pla_smooth_normal", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", + "material_id": "generic_pla", "intent_category": "smooth", "quality_type": "normal"}, + {"id": "um3_aa4_pla_strong_abnorm", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", + "material_id": "generic_pla", "intent_category": "strong", "quality_type": "abnorm"}] # type:List[Dict[str, str]] + + def test_intentCategories(application, intent_manager, container_registry): - mocked_metadata = [{"id": "um3_aa4_pla_smooth", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "smooth"}, - {"id": "um3_aa4_pla_strong", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "strong"}] - container_registry.findContainersMetadata = MagicMock(return_value=mocked_metadata) + # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). + container_registry.findContainersMetadata = MagicMock(return_value=mocked_intent_metadata) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): @@ -26,3 +47,50 @@ def test_intentCategories(application, intent_manager, container_registry): assert "default" in categories, "default should always be in categories" assert "strong" in categories, "strong should be in categories" assert "smooth" in categories, "smooth should be in categories" + + +def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry): + mocked_qualitygroup_metadata = { + "normal": QualityGroup("um3_aa4_pla_normal", "normal"), + "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] + + def mockIntentMetadatas(**kwargs) -> List[Dict[str, Any]]: + if "id" in kwargs: + return [x for x in mocked_intent_metadata if x["id"] == kwargs["id"]] + else: + # TODO? switch on 'kwargs["definition_id"]', "nozzle_name", "material_id" -> ... or go 1 deeper + return mocked_intent_metadata + container_registry.findContainersMetadata = MagicMock(side_effect=mockIntentMetadatas) + + quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) + for _, qualitygroup in mocked_qualitygroup_metadata.items(): + qualitygroup.node_for_global = MagicMock(name="Node for global") + application.getQualityManager = MagicMock(return_value=quality_manager) + + extruder_stack_a = MockContainer({"id": "A"}) + extruder_stack_a.variant = MockContainer({"id": "A_variant"}) + extruder_stack_a.material = MockContainer({"id": "A_material"}) + extruder_stack_b = MockContainer({"id": "B"}) + extruder_stack_b.variant = MockContainer({"id": "B_variant"}) + extruder_stack_b.material = MockContainer({"id": "B_material"}) + # See previous TODO, the above doesn't really matter if intentmetadatas is mocked out the way it is, but it should. + + extruder_manager.getUsedExtruderStacks = MagicMock(return_value=[extruder_stack_a, extruder_stack_b]) + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): + intents = intent_manager.currentAvailableIntents() + assert ("smooth", "normal") in intents + assert ("strong", "abnorm") in intents + assert len(intents) == 2 + + +def test_currentAvailableIntentCategories(application, quality_manager, intent_manager, container_registry): + # def currentAvailableIntentCategories(self) -> List[str]: + pass + + +def test_selectIntent(application, intent_manager, container_registry): + # def selectIntent(self, intent_category, quality_type) -> None: + pass From 2843fc903b1fe8038886fdf1ee9f7eb30459cfe2 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 28 Jun 2019 11:09:42 +0200 Subject: [PATCH 044/994] First OK test-case for 'currentAvailableIntents'. part of CURA-6091 --- tests/TestIntentManager.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 8b6a88b3b8..af5a2437c3 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -49,31 +49,39 @@ def test_intentCategories(application, intent_manager, container_registry): assert "smooth" in categories, "smooth should be in categories" -def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry): +def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): mocked_qualitygroup_metadata = { "normal": QualityGroup("um3_aa4_pla_normal", "normal"), "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] - def mockIntentMetadatas(**kwargs) -> List[Dict[str, Any]]: + def mockFindMetadata(**kwargs) -> List[Dict[str, Any]]: if "id" in kwargs: return [x for x in mocked_intent_metadata if x["id"] == kwargs["id"]] else: - # TODO? switch on 'kwargs["definition_id"]', "nozzle_name", "material_id" -> ... or go 1 deeper - return mocked_intent_metadata - container_registry.findContainersMetadata = MagicMock(side_effect=mockIntentMetadatas) + result = [] + for data in mocked_intent_metadata: + should_add = True + for key, value in kwargs.items(): + should_add &= (data[key] == value) + if should_add: + result.append(data) + return result + container_registry.findContainersMetadata = MagicMock(side_effect=mockFindMetadata) quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) for _, qualitygroup in mocked_qualitygroup_metadata.items(): qualitygroup.node_for_global = MagicMock(name="Node for global") application.getQualityManager = MagicMock(return_value=quality_manager) - extruder_stack_a = MockContainer({"id": "A"}) - extruder_stack_a.variant = MockContainer({"id": "A_variant"}) - extruder_stack_a.material = MockContainer({"id": "A_material"}) - extruder_stack_b = MockContainer({"id": "B"}) - extruder_stack_b.variant = MockContainer({"id": "B_variant"}) - extruder_stack_b.material = MockContainer({"id": "B_material"}) - # See previous TODO, the above doesn't really matter if intentmetadatas is mocked out the way it is, but it should. + global_stack.definition = MockContainer({"id": "ultimaker3"}) + application.getGlobalContainerStack = MagicMock(return_value=global_stack) + + extruder_stack_a = MockContainer({"id": "Extruder The First"}) + extruder_stack_a.variant = MockContainer({"name": "AA 0.4"}) + extruder_stack_a.material = MockContainer({"base_file": "generic_pla"}) + extruder_stack_b = MockContainer({"id": "Extruder II: Plastic Boogaloo"}) + extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) + extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) extruder_manager.getUsedExtruderStacks = MagicMock(return_value=[extruder_stack_a, extruder_stack_b]) From 6b918dbd1dabc49a894da35ab15b2c09369b4e33 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 28 Jun 2019 12:04:04 +0200 Subject: [PATCH 045/994] Fix typing in IntentCategoryModel. --- cura/Machines/Models/IntentCategoryModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 789050e391..ac69191ca1 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -19,14 +19,14 @@ class IntentCategoryModel(ListModel): #Translations to user-visible string. Ordered by weight. #TODO: Create a solution for this name and weight to be used dynamically. - name_translation = collections.OrderedDict() + name_translation = collections.OrderedDict() #type: "collections.OrderedDict[str,str]" name_translation["default"] = catalog.i18nc("@label", "Default") name_translation["engineering"] = catalog.i18nc("@label", "Engineering") name_translation["smooth"] = catalog.i18nc("@label", "Smooth") ## Creates a new model for a certain intent category. # \param The category to list the intent profiles for. - def __init__(self, intent_category: str): + def __init__(self, intent_category: str) -> None: super().__init__() self._intent_category = intent_category @@ -35,7 +35,7 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.WeightRole, "weight") ## Updates the list of intents. - def update(self): + def update(self) -> None: available_categories = IntentManager.getInstance().currentAvailableIntentCategories() result = [] for category in available_categories: From 810fee37eb39c52cdb42b705e35e8ffa85e81725 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 28 Jun 2019 12:10:39 +0200 Subject: [PATCH 046/994] Start to test other IntentManager functions. Very rudimentary at the moment, need to split the method into 3, and make a class for the setup. This also uncovered that the currentAvailableIntents doesn't (unless the global stack is missing) retrun any default intents, while currentAvailableIntentCategories does do that. Since it's not clear how we're going to handle that right now, I made a TODO in the code, which of course will have to be fixed before this/these branch/es are merged. part of CURA-6091 --- cura/Settings/IntentManager.py | 4 +++- tests/TestIntentManager.py | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index a5d71a918d..db7eb7b40a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -71,9 +71,11 @@ class IntentManager(QObject): global_stack = application.getGlobalContainerStack() if global_stack is None: return [("default", "normal")] + # TODO: We now do this (return a default) if the global stack is missing, but not in the code below, + # even though there should always be defaults. The problem then is what to do with the quality_types. + # Currently _also_ inconsistent with 'currentAvailableIntentCategoreis', which _does_ return default. quality_groups = application.getQualityManager().getQualityGroups(global_stack) available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} - # available_quality_types could just be 'quality_group.keys()', except for that the node_for_global may be None final_intent_ids = set() #type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index af5a2437c3..1012f8e2eb 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -50,6 +50,8 @@ def test_intentCategories(application, intent_manager, container_registry): def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): + # This also tests 'currentAvailableIntentCategories' and 'selectIntent' since the methods are so similar + mocked_qualitygroup_metadata = { "normal": QualityGroup("um3_aa4_pla_normal", "normal"), "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] @@ -88,17 +90,22 @@ def test_currentAvailableIntents(application, extruder_manager, quality_manager, with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): + intents = intent_manager.currentAvailableIntents() assert ("smooth", "normal") in intents assert ("strong", "abnorm") in intents - assert len(intents) == 2 + #assert ("default", "normal") in intents # Pending to-do in 'IntentManager'. + #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. + assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. + categories = intent_manager.currentAvailableIntentCategories() + assert "default" in categories # Currently inconsistent with 'currentAvailableIntents'! + assert "smooth" in categories + assert "strong" in categories + assert len(categories) == 3 -def test_currentAvailableIntentCategories(application, quality_manager, intent_manager, container_registry): - # def currentAvailableIntentCategories(self) -> List[str]: - pass - - -def test_selectIntent(application, intent_manager, container_registry): - # def selectIntent(self, intent_category, quality_type) -> None: - pass + for intent, quality in intents: + intent_manager.selectIntent(intent, quality) + assert extruder_stack_a.intent is not None + assert extruder_stack_b.intent is not None + # ... need MachineManager for this, split up methods anyway -> make into class, see examples others From ffe951523611235f7f6563f5676534c43a351824 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2019 08:57:40 +0200 Subject: [PATCH 047/994] Refactor: Split up single test method in smaller ones. part of CURA-6091 --- tests/TestIntentManager.py | 82 ++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 1012f8e2eb..22d4fccbb1 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -36,38 +36,26 @@ mocked_intent_metadata = [ {"id": "um3_aa4_pla_strong_abnorm", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "strong", "quality_type": "abnorm"}] # type:List[Dict[str, str]] - -def test_intentCategories(application, intent_manager, container_registry): - # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). - container_registry.findContainersMetadata = MagicMock(return_value=mocked_intent_metadata) - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] - assert "default" in categories, "default should always be in categories" - assert "strong" in categories, "strong should be in categories" - assert "smooth" in categories, "smooth should be in categories" +mocked_qualitygroup_metadata = { + "normal": QualityGroup("um3_aa4_pla_normal", "normal"), + "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] -def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): - # This also tests 'currentAvailableIntentCategories' and 'selectIntent' since the methods are so similar +def mockFindMetadata(**kwargs) -> List[Dict[str, Any]]: + if "id" in kwargs: + return [x for x in mocked_intent_metadata if x["id"] == kwargs["id"]] + else: + result = [] + for data in mocked_intent_metadata: + should_add = True + for key, value in kwargs.items(): + should_add &= (data[key] == value) + if should_add: + result.append(data) + return result - mocked_qualitygroup_metadata = { - "normal": QualityGroup("um3_aa4_pla_normal", "normal"), - "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] - def mockFindMetadata(**kwargs) -> List[Dict[str, Any]]: - if "id" in kwargs: - return [x for x in mocked_intent_metadata if x["id"] == kwargs["id"]] - else: - result = [] - for data in mocked_intent_metadata: - should_add = True - for key, value in kwargs.items(): - should_add &= (data[key] == value) - if should_add: - result.append(data) - return result +def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None: container_registry.findContainersMetadata = MagicMock(side_effect=mockFindMetadata) quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) @@ -87,10 +75,25 @@ def test_currentAvailableIntents(application, extruder_manager, quality_manager, extruder_manager.getUsedExtruderStacks = MagicMock(return_value=[extruder_stack_a, extruder_stack_b]) + +def test_intentCategories(application, intent_manager, container_registry): + # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). + container_registry.findContainersMetadata = MagicMock(return_value=mocked_intent_metadata) + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] + assert "default" in categories, "default should always be in categories" + assert "strong" in categories, "strong should be in categories" + assert "smooth" in categories, "smooth should be in categories" + + +def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): + doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): - intents = intent_manager.currentAvailableIntents() assert ("smooth", "normal") in intents assert ("strong", "abnorm") in intents @@ -98,14 +101,31 @@ def test_currentAvailableIntents(application, extruder_manager, quality_manager, #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. + +def test_currentAvailableIntentCategories(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): + doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): categories = intent_manager.currentAvailableIntentCategories() assert "default" in categories # Currently inconsistent with 'currentAvailableIntents'! assert "smooth" in categories assert "strong" in categories assert len(categories) == 3 + +def test_currentAvailableIntentCategories(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): + doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): + intents = intent_manager.currentAvailableIntents() for intent, quality in intents: intent_manager.selectIntent(intent, quality) - assert extruder_stack_a.intent is not None - assert extruder_stack_b.intent is not None + extruder_stacks = extruder_manager.getUsedExtruderStacks() + assert len(extruder_stacks) == 2 + assert extruder_stacks[0].intent is not None + assert extruder_stacks[1].intent is not None # ... need MachineManager for this, split up methods anyway -> make into class, see examples others From 50cbf71f6842d0dbcdb354f3c21755d7661d9876 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2019 13:15:18 +0200 Subject: [PATCH 048/994] Fixed test 'selectIntent' for IntentManager-tests. part of CURA-6091 --- tests/TestIntentManager.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 22d4fccbb1..c9d39f607e 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -49,14 +49,24 @@ def mockFindMetadata(**kwargs) -> List[Dict[str, Any]]: for data in mocked_intent_metadata: should_add = True for key, value in kwargs.items(): - should_add &= (data[key] == value) + if key in data.keys(): + should_add &= (data[key] == value) if should_add: result.append(data) return result +def mockFindContainers(**kwargs) -> List[MockContainer]: + result = [] + metadatas = mockFindMetadata(**kwargs) + for metadata in metadatas: + result.append(MockContainer(metadata)) + return result + + def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None: container_registry.findContainersMetadata = MagicMock(side_effect=mockFindMetadata) + container_registry.findContainers = MagicMock(side_effect=mockFindContainers) quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) for _, qualitygroup in mocked_qualitygroup_metadata.items(): @@ -115,7 +125,7 @@ def test_currentAvailableIntentCategories(application, extruder_manager, quality assert len(categories) == 3 -def test_currentAvailableIntentCategories(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): +def test_selectIntent(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): @@ -124,8 +134,7 @@ def test_currentAvailableIntentCategories(application, extruder_manager, quality intents = intent_manager.currentAvailableIntents() for intent, quality in intents: intent_manager.selectIntent(intent, quality) - extruder_stacks = extruder_manager.getUsedExtruderStacks() + extruder_stacks = extruder_manager.getUsedExtruderStacks() assert len(extruder_stacks) == 2 - assert extruder_stacks[0].intent is not None - assert extruder_stacks[1].intent is not None - # ... need MachineManager for this, split up methods anyway -> make into class, see examples others + assert extruder_stacks[0].intent.getMetaDataEntry("intent_category") == intent + assert extruder_stacks[1].intent.getMetaDataEntry("intent_category") == intent From 270cf28ea12a6eba74a291565f7a0b7ba9dafe32 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2019 14:43:56 +0200 Subject: [PATCH 049/994] Fix comments code review IntentManager. part of CURA-6091 --- cura/Settings/CuraContainerStack.py | 2 +- cura/Settings/IntentManager.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 278bc1dc4f..f3159467c6 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -92,7 +92,7 @@ class CuraContainerStack(ContainerStack): ## Set the intent container. # # \param new_intent The new intent container. It is expected to have a "type" metadata entry with the value "intent". - def setIntent(self, new_intent: InstanceContainer, postpone_emit: bool = False) -> None: + def setIntent(self, new_intent: InstanceContainer, *, postpone_emit: bool = False) -> None: self.replaceContainer(_ContainerIndexes.Intent, new_intent, postpone_emit=postpone_emit) ## Get the quality container. diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index db7eb7b40a..e16115ba2a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -77,14 +77,14 @@ class IntentManager(QObject): quality_groups = application.getQualityManager().getQualityGroups(global_stack) available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} - final_intent_ids = set() #type: Set[str] + final_intent_ids = set() # type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} - result = set() #type: Set[Tuple[str, str]] + result = set() # type: Set[Tuple[str, str]] for intent_id in final_intent_ids: intent_metadata = application.getContainerRegistry().findContainersMetadata(id = intent_id)[0] result.add((intent_metadata["intent_category"], intent_metadata["quality_type"])) @@ -104,7 +104,7 @@ class IntentManager(QObject): if global_stack is None: return ["default"] current_definition_id = global_stack.definition.getMetaDataEntry("id") - final_intent_categories = set() #type: Set[str] + final_intent_categories = set() # type: Set[str] for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") @@ -114,11 +114,11 @@ class IntentManager(QObject): ## The intent that gets selected by default when no intent is available for # the configuration, an extruder can't match the intent that the user # selects, or just when creating a new printer. - def defaultIntent(self) -> InstanceContainer: + def getDefaultIntent(self) -> InstanceContainer: return CuraApplication.getInstance().empty_intent_container ## Apply intent on the stacks. - def selectIntent(self, intent_category, quality_type) -> None: + def selectIntent(self, intent_category: str, quality_type: str) -> None: application = CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: @@ -131,11 +131,11 @@ class IntentManager(QObject): if intent: extruder_stack.intent = intent[0] else: - extruder_stack.intent = self.defaultIntent() + extruder_stack.intent = self.getDefaultIntent() application.getMachineManager().setQualityGroupByQualityType(quality_type) ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): - extruder_stack.intent = self.defaultIntent() + extruder_stack.intent = self.getDefaultIntent() From 3f29bce263a3ef83c770cf6c9b6a87b6f03e63f5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 3 Jul 2019 16:51:47 +0200 Subject: [PATCH 050/994] List intents per category This is the naive one. We want to list the default intents multiple times, once for every quality level. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 3f480e2eef..26467b1d90 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -4,11 +4,10 @@ from typing import Optional from PyQt5.QtCore import QObject from UM.Qt.ListModel import ListModel -from PyQt5.QtCore import Qt +from PyQt5.QtCore import Qt, pyqtProperty, pyqtSignal from UM.Settings.ContainerRegistry import ContainerRegistry - class IntentModel(ListModel): NameRole = Qt.UserRole + 1 IdRole = Qt.UserRole + 2 @@ -21,18 +20,31 @@ class IntentModel(ListModel): self.addRoleName(self.IdRole, "id") self.addRoleName(self.ContainerRole, "container") + self._intent_category = "engineering" + ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) self._update() + _intent_category_changed = pyqtSignal() + + def setIntentCategory(self, new_category: str) -> None: + if self._intent_category != new_category: + self._intent_category = new_category + self._intent_category_changed.emit() + + @pyqtProperty(str, fset=setIntentCategory, notify=_intent_category_changed) + def intentCategory(self) -> str: + return self._intent_category + def _onChanged(self, container): if container.getMetaDataEntry("type") == "intent": self._update() def _update(self) -> None: new_items = [] - for container in ContainerRegistry.getInstance().findInstanceContainers(type="intent"): + for container in ContainerRegistry.getInstance().findInstanceContainers(type = "intent", intent_category = self._intent_category): new_items.append({"name": container.getName(), "id": container.getId(), "container": container}) self.setItems(new_items) From 36971f00584e655b8c251cda9e8fe38ce7037857 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 3 Jul 2019 16:52:33 +0200 Subject: [PATCH 051/994] Give smooth an intent and increment setting_version Smooth needs an intent because otherwise it gets the default intent. None of the default intents are allowed to have files. Contributes to issue CURA-6597. --- resources/intent/smooth.inst.cfg | 3 ++- resources/intent/strong.inst.cfg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index e0ec3713ea..cbc95eb59a 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -4,8 +4,9 @@ name = Smooth (TEST INTENT) definition = fdmprinter [metadata] -setting_version = 7 +setting_version = 8 type = intent +intent_category = smooth [values] diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index 702778d598..5b26219c47 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -4,7 +4,7 @@ name = Strong (TEST INTENT) definition = fdmprinter [metadata] -setting_version = 7 +setting_version = 8 type = intent intent_category = engineering quality_type = draft From c75b83be2196857b64a453fc495249c4caaad922 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:08:15 +0200 Subject: [PATCH 052/994] Resolve circular imports Can't import CuraApplication because we create instances of IntentManager from the IntentsModel which is created in CuraApplication. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index e16115ba2a..783faafed6 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -3,7 +3,7 @@ from PyQt5.QtCore import QObject, pyqtSignal from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING -from cura.CuraApplication import CuraApplication +import cura.CuraApplication from cura.Settings.ExtruderManager import ExtruderManager from UM.Settings.InstanceContainer import InstanceContainer @@ -20,7 +20,7 @@ class IntentManager(QObject): def __init__(self) -> None: super().__init__() - CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.configurationChanged) + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.configurationChanged) self.configurationChanged.connect(self.selectDefaultIntent) pass @@ -42,7 +42,7 @@ class IntentManager(QObject): # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: - registry = CuraApplication.getInstance().getContainerRegistry() + registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) ## Collects and returns all intent categories available for the given @@ -67,7 +67,7 @@ class IntentManager(QObject): # \return A list of tuples of intent_category and quality_type. The actual # instance may vary per extruder. def currentAvailableIntents(self) -> List[Tuple[str, str]]: - application = CuraApplication.getInstance() + application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: return [("default", "normal")] @@ -100,7 +100,7 @@ class IntentManager(QObject): # \return List of all categories in the current configurations of all # extruders. def currentAvailableIntentCategories(self) -> List[str]: - global_stack = CuraApplication.getInstance().getGlobalContainerStack() + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return ["default"] current_definition_id = global_stack.definition.getMetaDataEntry("id") @@ -115,11 +115,11 @@ class IntentManager(QObject): # the configuration, an extruder can't match the intent that the user # selects, or just when creating a new printer. def getDefaultIntent(self) -> InstanceContainer: - return CuraApplication.getInstance().empty_intent_container + return cura.CuraApplication.CuraApplication.getInstance().empty_intent_container ## Apply intent on the stacks. def selectIntent(self, intent_category: str, quality_type: str) -> None: - application = CuraApplication.getInstance() + application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: return From 951b91e3d85eb972c3807a80ada1271bfa3ec7b9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:09:22 +0200 Subject: [PATCH 053/994] Filter on 'material' metadata instead of material_id This is consistent with how the material is stored in other profiles, such as quality profiles. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 783faafed6..0067a82f41 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -43,7 +43,7 @@ class IntentManager(QObject): # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) + return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material = material_id) ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From 3cce33be6f6710e7b69d4dd7cdc1dc528ef144dc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:14:06 +0200 Subject: [PATCH 054/994] Get intents for every active extruder, not every used extruder We want the intents for basically any extruder, not just the one that would get used by a slice using the current settings for extruder_nr. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 0067a82f41..c91f65222e 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -73,13 +73,13 @@ class IntentManager(QObject): return [("default", "normal")] # TODO: We now do this (return a default) if the global stack is missing, but not in the code below, # even though there should always be defaults. The problem then is what to do with the quality_types. - # Currently _also_ inconsistent with 'currentAvailableIntentCategoreis', which _does_ return default. + # Currently _also_ inconsistent with 'currentAvailableIntentCategories', which _does_ return default. quality_groups = application.getQualityManager().getQualityGroups(global_stack) available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} final_intent_ids = set() # type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") - for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} From 168c9db648dd4fe7780438856d68b6d6c4334211 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:28:23 +0200 Subject: [PATCH 055/994] Code style: Space around binary operators Contributes to issue CURA-6597. --- tests/TestIntentManager.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index c9d39f607e..06f80a2cd9 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -12,8 +12,8 @@ from tests.Settings.MockContainer import MockContainer @pytest.fixture() def quality_manager(application, container_registry, global_stack) -> QualityManager: application.getGlobalContainerStack = MagicMock(return_value = global_stack) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): manager = QualityManager(application) return manager @@ -24,8 +24,8 @@ def intent_manager(application, extruder_manager, machine_manager, quality_manag application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getMachineManager = MagicMock(return_value = machine_manager) application.getQualityManager = MagicMock(return_value = quality_manager) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): manager = IntentManager() return manager @@ -65,16 +65,16 @@ def mockFindContainers(**kwargs) -> List[MockContainer]: def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None: - container_registry.findContainersMetadata = MagicMock(side_effect=mockFindMetadata) - container_registry.findContainers = MagicMock(side_effect=mockFindContainers) + container_registry.findContainersMetadata = MagicMock(side_effect = mockFindMetadata) + container_registry.findContainers = MagicMock(side_effect = mockFindContainers) - quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) + quality_manager.getQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata) for _, qualitygroup in mocked_qualitygroup_metadata.items(): - qualitygroup.node_for_global = MagicMock(name="Node for global") - application.getQualityManager = MagicMock(return_value=quality_manager) + qualitygroup.node_for_global = MagicMock(name = "Node for global") + application.getQualityManager = MagicMock(return_value = quality_manager) global_stack.definition = MockContainer({"id": "ultimaker3"}) - application.getGlobalContainerStack = MagicMock(return_value=global_stack) + application.getGlobalContainerStack = MagicMock(return_value = global_stack) extruder_stack_a = MockContainer({"id": "Extruder The First"}) extruder_stack_a.variant = MockContainer({"name": "AA 0.4"}) @@ -83,15 +83,15 @@ def doSetup(application, extruder_manager, quality_manager, container_registry, extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) - extruder_manager.getUsedExtruderStacks = MagicMock(return_value=[extruder_stack_a, extruder_stack_b]) + extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b]) def test_intentCategories(application, intent_manager, container_registry): # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). - container_registry.findContainersMetadata = MagicMock(return_value=mocked_intent_metadata) + container_registry.findContainersMetadata = MagicMock(return_value = mocked_intent_metadata) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] assert "default" in categories, "default should always be in categories" assert "strong" in categories, "strong should be in categories" From 8699a407de924f11faee6b3a637947e82bef067a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:09:22 +0200 Subject: [PATCH 056/994] Filter on 'material' metadata instead of material_id This is consistent with how the material is stored in other profiles, such as quality profiles. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index e16115ba2a..51aafb0f7a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -43,7 +43,7 @@ class IntentManager(QObject): # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: registry = CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id) + return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material = material_id) ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From 7518b7feb02bb7e1ef76f74275e80fc490a9f1d8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:14:06 +0200 Subject: [PATCH 057/994] Get intents for every active extruder, not every used extruder We want the intents for basically any extruder, not just the one that would get used by a slice using the current settings for extruder_nr. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 51aafb0f7a..54324535dd 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -73,13 +73,13 @@ class IntentManager(QObject): return [("default", "normal")] # TODO: We now do this (return a default) if the global stack is missing, but not in the code below, # even though there should always be defaults. The problem then is what to do with the quality_types. - # Currently _also_ inconsistent with 'currentAvailableIntentCategoreis', which _does_ return default. + # Currently _also_ inconsistent with 'currentAvailableIntentCategories', which _does_ return default. quality_groups = application.getQualityManager().getQualityGroups(global_stack) available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} final_intent_ids = set() # type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") - for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} From c2b20e5cc696476cd1cca4d396ddf24fd0bee34d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:43:25 +0200 Subject: [PATCH 058/994] Only return intents from intentMetadatas Otherwise we also get quality profiles for the same printer... Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c91f65222e..c90d2cb9b0 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -43,7 +43,7 @@ class IntentManager(QObject): # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material = material_id) + return registry.findContainersMetadata(type = "intent", definition = definition_id, variant = nozzle_name, material = material_id) ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From 1dd69fe441f92acab885752808f030809611827d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 09:43:25 +0200 Subject: [PATCH 059/994] Only return intents from intentMetadatas Otherwise we also get quality profiles for the same printer... Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 54324535dd..e80c03ce34 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -43,7 +43,7 @@ class IntentManager(QObject): # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: registry = CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material = material_id) + return registry.findContainersMetadata(type = "intent", definition = definition_id, variant = nozzle_name, material = material_id) ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From 49a6161ee8dc02993f85b4b3e611ac83fb96f6aa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:02:49 +0200 Subject: [PATCH 060/994] Register IntentCategoryModel to be used in QML We want to be able to repeat on this model. Contributes to issue CURA-6597. --- cura/CuraApplication.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 28a8e12deb..f2d74a02bf 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -62,6 +62,7 @@ from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob from cura.Arranging.ShapeArray import ShapeArray from cura.Machines.Models.IntentModel import IntentModel +from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel from cura.Operations.SetParentOperation import SetParentOperation @@ -1070,6 +1071,7 @@ class CuraApplication(QtApplication): "CustomQualityProfilesDropDownMenuModel", self.getCustomQualityProfilesDropDownMenuModel) qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel") qmlRegisterType(IntentModel, "Cura", 1, 6, "IntentModel") + qmlRegisterType(IntentCategoryModel, "Cura", 1, 6, "IntentCategoryModel") qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler") qmlRegisterType(SettingVisibilityPresetsModel, "Cura", 1, 0, "SettingVisibilityPresetsModel") From 6ba70f3425dec0391e56871b4133b144854ce898 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:04:44 +0200 Subject: [PATCH 061/994] Rewrite IntentModel to return quality types rather than actual profiles We don't want the profiles, because that'd be specific to one extruder. We want the quality types and intent categories as tuples again. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 26467b1d90..b9839aa2ad 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -7,18 +7,18 @@ from UM.Qt.ListModel import ListModel from PyQt5.QtCore import Qt, pyqtProperty, pyqtSignal from UM.Settings.ContainerRegistry import ContainerRegistry +from cura.Settings.IntentManager import IntentManager +import cura.CuraApplication class IntentModel(ListModel): NameRole = Qt.UserRole + 1 - IdRole = Qt.UserRole + 2 - ContainerRole = Qt.UserRole + 3 + QualityTypeRole = Qt.UserRole + 2 def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) self.addRoleName(self.NameRole, "name") - self.addRoleName(self.IdRole, "id") - self.addRoleName(self.ContainerRole, "container") + self.addRoleName(self.QualityTypeRole, "quality_type") self._intent_category = "engineering" @@ -34,7 +34,7 @@ class IntentModel(ListModel): self._intent_category = new_category self._intent_category_changed.emit() - @pyqtProperty(str, fset=setIntentCategory, notify=_intent_category_changed) + @pyqtProperty(str, fset = setIntentCategory, notify = _intent_category_changed) def intentCategory(self) -> str: return self._intent_category @@ -44,7 +44,12 @@ class IntentModel(ListModel): def _update(self) -> None: new_items = [] - for container in ContainerRegistry.getInstance().findInstanceContainers(type = "intent", intent_category = self._intent_category): - new_items.append({"name": container.getName(), "id": container.getId(), "container": container}) + application = cura.CuraApplication.CuraApplication.getInstance() + quality_manager = application.getQualityManager() + global_stack = application.getGlobalContainerStack() + + for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents(): + if intent_category == self._intent_category: + new_items.append({"name": quality_manager.getQualityGroups(global_stack)[quality_type].name, "quality_type": quality_type}) self.setItems(new_items) From 926df1111b25f0cb702d69ecdd19e6377fe7ef81 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:06:47 +0200 Subject: [PATCH 062/994] Iterate over all extruder stacks rather than just the used ones Otherwise it usually only iterates over the one that the model is printing with or something. We want to iterate over all extruders that are not deactivated. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c90d2cb9b0..841d38cded 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -105,7 +105,7 @@ class IntentManager(QObject): return ["default"] current_definition_id = global_stack.definition.getMetaDataEntry("id") final_intent_categories = set() # type: Set[str] - for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_categories.update(self.intentCategories(current_definition_id, nozzle_name, material_id)) @@ -124,7 +124,7 @@ class IntentManager(QObject): if global_stack is None: return current_definition_id = global_stack.definition.getMetaDataEntry("id") - for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") intent = application.getContainerRegistry().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) @@ -137,5 +137,5 @@ class IntentManager(QObject): ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: - for extruder_stack in ExtruderManager.getInstance().getUsedExtruderStacks(): + for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): extruder_stack.intent = self.getDefaultIntent() From fd32abd53c7e4cd5bf4542b6901b767dd69b9771 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:10:06 +0200 Subject: [PATCH 063/994] Add property for currently selected intent This is necessary for the interface to highlight the correct bullet or the correct menu item. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 841d38cded..59cdc0115f 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -1,7 +1,7 @@ #Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtSignal +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING import cura.CuraApplication from cura.Settings.ExtruderManager import ExtruderManager @@ -31,7 +31,8 @@ class IntentManager(QObject): cls.__instance = IntentManager() return cls.__instance - configurationChanged = pyqtSignal() + configurationChanged = pyqtSignal() #Triggered when something changed in the rest of the stack. + intentCategoryChanged = pyqtSignal() #Triggered when we switch categories. ## Gets the metadata dictionaries of all intent profiles for a given # configuration. @@ -117,8 +118,14 @@ class IntentManager(QObject): def getDefaultIntent(self) -> InstanceContainer: return cura.CuraApplication.CuraApplication.getInstance().empty_intent_container + @pyqtProperty(str, notify = intentCategoryChanged) + def getCurrentIntentCategory(self) -> str: + return ExtruderManager.getInstance().getActiveExtruderStack().intent.getMetaDataEntry("intent_category") + ## Apply intent on the stacks. + @pyqtSlot(str, str) def selectIntent(self, intent_category: str, quality_type: str) -> None: + old_intent_category = self.getCurrentIntentCategory() application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: @@ -134,6 +141,8 @@ class IntentManager(QObject): extruder_stack.intent = self.getDefaultIntent() application.getMachineManager().setQualityGroupByQualityType(quality_type) + if old_intent_category != intent_category: + self.intentCategoryChanged.emit() ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: From d2daa15a13bec1d33164b0ec6201616f3ea6f8b1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:10:54 +0200 Subject: [PATCH 064/994] Make testing intent profiles dependent on material, printer and variant This way we can test with them (as long as you've selected ultimaker 3, AA0.4 and PLA). Contributes to issue CURA-6597. --- resources/intent/smooth.inst.cfg | 5 ++++- resources/intent/strong.inst.cfg | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index cbc95eb59a..474aa05e57 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -1,12 +1,15 @@ [general] version = 4 name = Smooth (TEST INTENT) -definition = fdmprinter +definition = ultimaker3 [metadata] setting_version = 8 type = intent intent_category = smooth +quality_type = draft +variant = AA 0.4 +material = generic_pla [values] diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index 5b26219c47..08e568e0d7 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -1,15 +1,15 @@ [general] version = 4 name = Strong (TEST INTENT) -definition = fdmprinter +definition = ultimaker3 [metadata] setting_version = 8 type = intent intent_category = engineering quality_type = draft -material = generic_abs variant = AA 0.4 +material = generic_pla [values] From bd2237dc45371871c541a718a370eeaaa687b2f5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 11:31:59 +0200 Subject: [PATCH 065/994] Update intent categories upon adding containers or changing configuration Also upon start-up. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentCategoryModel.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index ac69191ca1..0766360892 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -6,6 +6,7 @@ import collections from cura.Settings.IntentManager import IntentManager from UM.Qt.ListModel import ListModel +from UM.Settings.ContainerRegistry import ContainerRegistry #To update the list if anything changes. from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -34,6 +35,12 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.IntentCategoryRole, "intent_category") self.addRoleName(self.WeightRole, "weight") + ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) + ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) + IntentManager.getInstance().configurationChanged.connect(self._onChanged) + + self.update() + ## Updates the list of intents. def update(self) -> None: available_categories = IntentManager.getInstance().currentAvailableIntentCategories() From cf68157508f255ae9b30ef90d726ba6608d87b94 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 12:29:02 +0200 Subject: [PATCH 066/994] Fix updating upon containers or configuration changing Copy-paste mistake... Contributes to issue CURA-6597. --- cura/Machines/Models/IntentCategoryModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 0766360892..83f03b158a 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -35,9 +35,9 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.IntentCategoryRole, "intent_category") self.addRoleName(self.WeightRole, "weight") - ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) - ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) - IntentManager.getInstance().configurationChanged.connect(self._onChanged) + ContainerRegistry.getInstance().containerAdded.connect(self.update) + ContainerRegistry.getInstance().containerRemoved.connect(self.update) + IntentManager.getInstance().configurationChanged.connect(self.update) self.update() From a6e3828eaa0f2926203c2b771f04b37354c79a5b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 12:33:50 +0200 Subject: [PATCH 067/994] Efficiency: Don't update model if adding different container types In fact we might want to delay updating until after the program has started up. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentCategoryModel.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 83f03b158a..c7484808ee 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -3,11 +3,15 @@ from PyQt5.QtCore import Qt import collections +from typing import TYPE_CHECKING from cura.Settings.IntentManager import IntentManager from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry #To update the list if anything changes. +if TYPE_CHECKING: + from UM.Settings.ContainerRegistry import ContainerInterface + from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -35,12 +39,17 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.IntentCategoryRole, "intent_category") self.addRoleName(self.WeightRole, "weight") - ContainerRegistry.getInstance().containerAdded.connect(self.update) - ContainerRegistry.getInstance().containerRemoved.connect(self.update) + ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) + ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) IntentManager.getInstance().configurationChanged.connect(self.update) self.update() + ## Updates the list of intents if an intent profile was added or removed. + def _onContainerChange(self, container: "ContainerInterface") -> None: + if container.getMetaDataEntry("type") == "intent": + self.update() + ## Updates the list of intents. def update(self) -> None: available_categories = IntentManager.getInstance().currentAvailableIntentCategories() From 0047874f030cbdeb479d725b2f52124a30520b66 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 12:35:11 +0200 Subject: [PATCH 068/994] Get translation from list of keys rather than items Because the category is not in a list of tuples. It's just the key of the dict. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentCategoryModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index c7484808ee..53193bd73d 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -58,6 +58,6 @@ class IntentCategoryModel(ListModel): result.append({ "name": self.name_translation.get(category, catalog.i18nc("@label", "Unknown")), "intent_category": category, - "weight": list(self.name_translation.items()).index(category) + "weight": list(self.name_translation.keys()).index(category) }) super().update(result) \ No newline at end of file From 6e373e02c0cd0b3f90f915a6082c5c139c60df32 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jul 2019 12:36:14 +0200 Subject: [PATCH 069/994] Update through self.setItems rather than super().update Because super().update doesn't exist in this case. Stupid. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentCategoryModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 53193bd73d..9a520a2d31 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -60,4 +60,4 @@ class IntentCategoryModel(ListModel): "intent_category": category, "weight": list(self.name_translation.keys()).index(category) }) - super().update(result) \ No newline at end of file + self.setItems(result) \ No newline at end of file From 45cb34c3e4b1fe9beec1ded8ee67b5a1ce714787 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 11:19:16 +0200 Subject: [PATCH 070/994] Refresh list of intents upon changing category The category is changed after constructing by the QML code in order to set its property. This is now updating twice: Once for the default category and once for the final one set by QML. This is a bit inefficient. But make it work before optimising it! Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index b9839aa2ad..c67544e2f6 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -33,6 +33,7 @@ class IntentModel(ListModel): if self._intent_category != new_category: self._intent_category = new_category self._intent_category_changed.emit() + self._update() @pyqtProperty(str, fset = setIntentCategory, notify = _intent_category_changed) def intentCategory(self) -> str: From 32c5118ae486de22ece22da48ef00f2794569a5d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 11:45:01 +0200 Subject: [PATCH 071/994] Add intents per category to the intent menu They are in the wrong order currently. The section headers all appear at the end and they are not greyed out. This must be fixed. The order might prove difficult... We'll see, but I want this locked in now because it works. Contributes to issue CURA-6597. --- resources/qml/Menus/IntentMenu.qml | 40 ++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/resources/qml/Menus/IntentMenu.qml b/resources/qml/Menus/IntentMenu.qml index 410ab70eb7..7e117acdb0 100644 --- a/resources/qml/Menus/IntentMenu.qml +++ b/resources/qml/Menus/IntentMenu.qml @@ -14,27 +14,47 @@ Menu property int extruderIndex: 0 - Cura.IntentModel + Cura.IntentCategoryModel { - id: intentModel + id: intentCategoryModel } Instantiator { - model: intentModel + model: intentCategoryModel - MenuItem + MenuItem //Section header. { text: model.name - checkable: true + checkable: false checked: false - Binding on checked + + property var per_category_intents: Cura.IntentModel { - when: Cura.MachineManager.activeStack != null - value: Cura.MachineManager.activeStack.intent == model.container + id: intentModel + intentCategory: model.intent_category + } + + property var intent_instantiator: Instantiator + { + model: intentModel + MenuItem + { + text: model.name + checkable: true + checked: false + Binding on checked + { + when: Cura.MachineManager.activeStack != null + value: Cura.MachineManager.activeStack.intent.metaData["intent_category"] == intentModel.intentCategory && Cura.MachineManager.activeStack.quality.metaData["quality_type"] == model.quality_type + } + exclusiveGroup: group + onTriggered: Cura.IntentManager.selectIntent(intentModel.intentCategory, model.quality_type) + } + + onObjectAdded: menu.insertItem(index, object) + onObjectRemoved: menu.removeItem(object) } - exclusiveGroup: group - onTriggered: Cura.MachineManager.activeStack.intent = model.container } onObjectAdded: menu.insertItem(index, object) From 9aeea22c738b711bc2535c6f9113ffe187291cf4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 12:05:44 +0200 Subject: [PATCH 072/994] Disable intent category headers Makes 'em look like headers. Contributes to issue CURA-6597. --- resources/qml/Menus/IntentMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/IntentMenu.qml b/resources/qml/Menus/IntentMenu.qml index 7e117acdb0..8aba7cbde6 100644 --- a/resources/qml/Menus/IntentMenu.qml +++ b/resources/qml/Menus/IntentMenu.qml @@ -26,7 +26,7 @@ Menu MenuItem //Section header. { text: model.name - checkable: false + enabled: false checked: false property var per_category_intents: Cura.IntentModel From 8cea9c5b8755250490a0c8ca618b48e39972115a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 13:03:20 +0200 Subject: [PATCH 073/994] Register IntentManager in QML This way we can change the intent from the interface. Contributes to issue CURA-6597. --- cura/CuraApplication.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f2d74a02bf..953336fc30 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -61,8 +61,6 @@ from cura.Arranging.Arrange import Arrange from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob from cura.Arranging.ShapeArray import ShapeArray -from cura.Machines.Models.IntentModel import IntentModel -from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel from cura.Operations.SetParentOperation import SetParentOperation @@ -93,6 +91,8 @@ from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfile from cura.Machines.Models.QualitySettingsModel import QualitySettingsModel from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel from cura.Machines.Models.UserChangesModel import UserChangesModel +from cura.Machines.Models.IntentModel import IntentModel +from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage @@ -105,6 +105,7 @@ from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderStack import ExtruderStack from cura.Settings.MachineManager import MachineManager from cura.Settings.MachineNameValidator import MachineNameValidator +from cura.Settings.IntentManager import IntentManager from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler from cura.Settings.SettingInheritanceManager import SettingInheritanceManager from cura.Settings.SidebarCustomMenuItemsModel import SidebarCustomMenuItemsModel @@ -938,6 +939,9 @@ class CuraApplication(QtApplication): def getQualityManager(self, *args) -> "QualityManager": return self._quality_manager + def getIntentManager(self, *args) -> IntentManager: + return IntentManager.getInstance() + def getObjectsModel(self, *args): if self._object_manager is None: self._object_manager = ObjectsModel(self) @@ -1037,6 +1041,7 @@ class CuraApplication(QtApplication): qmlRegisterSingletonType(CuraSceneController, "Cura", 1, 0, "SceneController", self.getCuraSceneController) qmlRegisterSingletonType(ExtruderManager, "Cura", 1, 0, "ExtruderManager", self.getExtruderManager) qmlRegisterSingletonType(MachineManager, "Cura", 1, 0, "MachineManager", self.getMachineManager) + qmlRegisterSingletonType(IntentManager, "Cura", 1, 6, "IntentManager", self.getIntentManager) qmlRegisterSingletonType(SettingInheritanceManager, "Cura", 1, 0, "SettingInheritanceManager", self.getSettingInheritanceManager) qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, "SimpleModeSettingsManager", self.getSimpleModeSettingsManager) qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, "MachineActionManager", self.getMachineActionManager) From 3729e90b249911b89d91fb8d692ca618b518ab15 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 13:06:27 +0200 Subject: [PATCH 074/994] Fix getting original intent category It's now a property so it doesn't need the brackets. Contributes to issue CURA-6597. --- cura/Settings/IntentManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 59cdc0115f..158381b189 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -125,7 +125,7 @@ class IntentManager(QObject): ## Apply intent on the stacks. @pyqtSlot(str, str) def selectIntent(self, intent_category: str, quality_type: str) -> None: - old_intent_category = self.getCurrentIntentCategory() + old_intent_category = self.getCurrentIntentCategory application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: From 28f1e670f5623ba7f2eda6ca61726fd19963ec90 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jul 2019 14:20:36 +0200 Subject: [PATCH 075/994] Give special values to the intents This way we can see if the correct profile actually got loaded. Contributes to issue CURA-6597. --- resources/intent/smooth.inst.cfg | 2 +- resources/intent/strong.inst.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index 474aa05e57..cfaa18c2bf 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -12,4 +12,4 @@ variant = AA 0.4 material = generic_pla [values] - +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index 08e568e0d7..e90b73d7d8 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -12,4 +12,4 @@ variant = AA 0.4 material = generic_pla [values] - +infill_sparse_density = 50 \ No newline at end of file From 07c5c4d9f02596e4eb03d85843c9638b964c65ef Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 9 Jul 2019 10:26:49 +0200 Subject: [PATCH 076/994] Return empty model if there is no printer added yet Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index c67544e2f6..1151ff836d 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -48,6 +48,8 @@ class IntentModel(ListModel): application = cura.CuraApplication.CuraApplication.getInstance() quality_manager = application.getQualityManager() global_stack = application.getGlobalContainerStack() + if not global_stack: + self.setItems(new_items) for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents(): if intent_category == self._intent_category: From 86750c0446748c720af2d609b366404a55d2207f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 9 Jul 2019 10:54:47 +0200 Subject: [PATCH 077/994] Don't continue after returning empty list Oops. Shouldn't have pushed... Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 1151ff836d..f4ed6e8206 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -50,6 +50,7 @@ class IntentModel(ListModel): global_stack = application.getGlobalContainerStack() if not global_stack: self.setItems(new_items) + return for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents(): if intent_category == self._intent_category: From e2fd90506a2720c02d0d344c43e88e3dc73d38ca Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 9 Jul 2019 10:56:11 +0200 Subject: [PATCH 078/994] Include intent profiles from the default intents If we have the default intent category, list all quality types available. Contributes to issue CURA-6597. --- cura/Machines/Models/IntentModel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index f4ed6e8206..61fa14936e 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -51,9 +51,13 @@ class IntentModel(ListModel): if not global_stack: self.setItems(new_items) return + quality_groups = quality_manager.getQualityGroups(global_stack) for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents(): if intent_category == self._intent_category: - new_items.append({"name": quality_manager.getQualityGroups(global_stack)[quality_type].name, "quality_type": quality_type}) + new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type}) + if self._intent_category == "default": #For Default we always list all quality types. We can't filter on available profiles since the empty intent is not a specific quality type. + for quality_type in quality_groups.keys(): + new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type}) self.setItems(new_items) From 659a276f65194c5cf734a6835bd101e0cdf68389 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 9 Jul 2019 11:29:24 +0200 Subject: [PATCH 079/994] Rename signal CURA-6597 --- cura/Machines/Models/IntentModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 61fa14936e..7b81821244 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -27,15 +27,15 @@ class IntentModel(ListModel): self._update() - _intent_category_changed = pyqtSignal() + intentCategoryChanged = pyqtSignal() def setIntentCategory(self, new_category: str) -> None: if self._intent_category != new_category: self._intent_category = new_category - self._intent_category_changed.emit() + self.intentCategoryChanged.emit() self._update() - @pyqtProperty(str, fset = setIntentCategory, notify = _intent_category_changed) + @pyqtProperty(str, fset = setIntentCategory, notify = intentCategoryChanged) def intentCategory(self) -> str: return self._intent_category From f086c1eb1199abdd4a9b41a77c732236204d5bc3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 9 Jul 2019 11:30:15 +0200 Subject: [PATCH 080/994] Minor cleanup changes CURA-6597 --- cura/Settings/IntentManager.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 158381b189..18a7191fd7 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -2,9 +2,9 @@ #Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot -from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING +from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING import cura.CuraApplication -from cura.Settings.ExtruderManager import ExtruderManager +from cura.Settings.cura_empty_instance_containers import empty_intent_container from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: @@ -80,7 +80,7 @@ class IntentManager(QObject): final_intent_ids = set() # type: Set[str] current_definition_id = global_stack.definition.getMetaDataEntry("id") - for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): + for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} @@ -106,7 +106,7 @@ class IntentManager(QObject): return ["default"] current_definition_id = global_stack.definition.getMetaDataEntry("id") final_intent_categories = set() # type: Set[str] - for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): + for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_categories.update(self.intentCategories(current_definition_id, nozzle_name, material_id)) @@ -116,22 +116,26 @@ class IntentManager(QObject): # the configuration, an extruder can't match the intent that the user # selects, or just when creating a new printer. def getDefaultIntent(self) -> InstanceContainer: - return cura.CuraApplication.CuraApplication.getInstance().empty_intent_container + return empty_intent_container @pyqtProperty(str, notify = intentCategoryChanged) - def getCurrentIntentCategory(self) -> str: - return ExtruderManager.getInstance().getActiveExtruderStack().intent.getMetaDataEntry("intent_category") + def currentIntentCategory(self) -> str: + application = cura.CuraApplication.CuraApplication.getInstance() + active_extruder_stack = application.getMachineManager().activeStack + if active_extruder_stack is None: + return "" + return active_extruder_stack.intent.getMetaDataEntry("intent_category", "") ## Apply intent on the stacks. @pyqtSlot(str, str) def selectIntent(self, intent_category: str, quality_type: str) -> None: - old_intent_category = self.getCurrentIntentCategory + old_intent_category = self.currentIntentCategory application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: return current_definition_id = global_stack.definition.getMetaDataEntry("id") - for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): + for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") intent = application.getContainerRegistry().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) @@ -146,5 +150,9 @@ class IntentManager(QObject): ## Selects the default intents on every extruder. def selectDefaultIntent(self) -> None: - for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): + application = cura.CuraApplication.CuraApplication.getInstance() + global_stack = application.getGlobalContainerStack() + if global_stack is None: + return + for extruder_stack in global_stack.extruderList: extruder_stack.intent = self.getDefaultIntent() From 8863516aa40459a20dd12f29a81a66b3f76a0aef Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 9 Jul 2019 12:53:12 +0200 Subject: [PATCH 081/994] Rename function name and fix tests CURA-6597 --- cura/Machines/Models/IntentModel.py | 2 +- cura/Settings/IntentManager.py | 2 +- tests/TestIntentManager.py | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 7b81821244..87bcd08277 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -53,7 +53,7 @@ class IntentModel(ListModel): return quality_groups = quality_manager.getQualityGroups(global_stack) - for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents(): + for intent_category, quality_type in IntentManager.getInstance().getCurrentAvailableIntents(): if intent_category == self._intent_category: new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type}) if self._intent_category == "default": #For Default we always list all quality types. We can't filter on available profiles since the empty intent is not a specific quality type. diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 18a7191fd7..17e793b948 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -67,7 +67,7 @@ class IntentManager(QObject): # # \return A list of tuples of intent_category and quality_type. The actual # instance may vary per extruder. - def currentAvailableIntents(self) -> List[Tuple[str, str]]: + def getCurrentAvailableIntents(self) -> List[Tuple[str, str]]: application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() if global_stack is None: diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 06f80a2cd9..337af817d1 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -83,6 +83,7 @@ def doSetup(application, extruder_manager, quality_manager, container_registry, extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) + application.getGlobalContainerStack().extruderList = [extruder_stack_a, extruder_stack_b] extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b]) @@ -98,18 +99,17 @@ def test_intentCategories(application, intent_manager, container_registry): assert "smooth" in categories, "smooth should be in categories" -def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): +def test_getCurrentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): - intents = intent_manager.currentAvailableIntents() - assert ("smooth", "normal") in intents - assert ("strong", "abnorm") in intents - #assert ("default", "normal") in intents # Pending to-do in 'IntentManager'. - #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. - assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + intents = intent_manager.getCurrentAvailableIntents() + assert ("smooth", "normal") in intents + assert ("strong", "abnorm") in intents + #assert ("default", "normal") in intents # Pending to-do in 'IntentManager'. + #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. + assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. def test_currentAvailableIntentCategories(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): @@ -131,7 +131,7 @@ def test_selectIntent(application, extruder_manager, quality_manager, intent_man with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): - intents = intent_manager.currentAvailableIntents() + intents = intent_manager.getCurrentAvailableIntents() for intent, quality in intents: intent_manager.selectIntent(intent, quality) extruder_stacks = extruder_manager.getUsedExtruderStacks() From 4e0b9d7b78884b9d022c56aa299d0c7ce22dafc9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 9 Jul 2019 13:01:54 +0200 Subject: [PATCH 082/994] Fix typing CURA-6597 --- cura/Machines/Models/IntentModel.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 87bcd08277..275087689b 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -1,15 +1,17 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional -from PyQt5.QtCore import QObject -from UM.Qt.ListModel import ListModel -from PyQt5.QtCore import Qt, pyqtProperty, pyqtSignal +from typing import Optional, List, Dict, Any +from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal + +from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry + from cura.Settings.IntentManager import IntentManager import cura.CuraApplication + class IntentModel(ListModel): NameRole = Qt.UserRole + 1 QualityTypeRole = Qt.UserRole + 2 @@ -44,7 +46,7 @@ class IntentModel(ListModel): self._update() def _update(self) -> None: - new_items = [] + new_items = [] # type: List[Dict[str, Any]] application = cura.CuraApplication.CuraApplication.getInstance() quality_manager = application.getQualityManager() global_stack = application.getGlobalContainerStack() From 037f1967c851dc9cccddde003bf372c6acf96939 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 10 Jul 2019 14:57:26 +0200 Subject: [PATCH 083/994] Remove override for version number in CuraContainerStack Otherwise plug-ins can't register ContainerStacks any more. As discussed in the CCB. --- cura/Settings/CuraContainerStack.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 278bc1dc4f..c141ac9b0e 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -37,8 +37,6 @@ from . import Exceptions # This also means that operations on the stack that modifies the container ordering is prohibited and # will raise an exception. class CuraContainerStack(ContainerStack): - Version = 5 # type: int - def __init__(self, container_id: str) -> None: super().__init__(container_id) From 4067f5216ecbe095b2b40bc442025322b9ba68c6 Mon Sep 17 00:00:00 2001 From: Mathias Lyngklip Kjeldgaard Date: Wed, 31 Jul 2019 13:34:28 +0200 Subject: [PATCH 084/994] Create DisplayRemainingTimeOnLCD.py Added a post-processing script that prints out the estimated time remaining generated by Cura. --- .../scripts/DisplayRemainingTimeOnLCD.py | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py diff --git a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py new file mode 100644 index 0000000000..a943ca58f8 --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py @@ -0,0 +1,86 @@ + +from ..Script import Script + +import re +import datetime + + +class DisplayRemainingTimeOnLCD(Script): + + def __init__(self): + super().__init__() + + + def getSettingDataString(self): + return """{ + "name":"Disaplay Remaining Time on LCD", + "key":"DisplayRemainingTimeOnLCD", + "metadata": {}, + "version": 2, + "settings": + { + "TurnOn": + { + "label": "Enable", + "description": "When enabled, It will write Time Left HHMMSS on the display", + "type": "bool", + "default_value": true + } + } + }""" + + def execute(self, data): + if self.getSettingValueByKey("TurnOn"): + TotalTime = 0 # Var for total time + TotalTimeString = "" # Var for the string we insert + for layer in data: + layer_index = data.index(layer) + lines = layer.split("\n") + for line in lines: + if line.startswith(";TIME:"): + # At this point, we have found a line in the GCODE with ";TIME:" + # which is the indication of TotalTime. Looks like: ";TIME:1337", where + # 1337 is the total print time in seconds. + line_index = lines.index(line) # We take a hold of that line + minString = re.split(":", line) # Then we split it, so we can get the number + + StringMedTal = "{}".format(minString[1]) # Here we insert that number from the + # list into a string. + + TotalTime = int(StringMedTal) # Only to contert it to a int. + + m, s = divmod(TotalTime, 60) # Math to calculate + h, m = divmod(m, 60) # hours, minutes and seconds. + TotalTimeString = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string + lines[line_index] = "M117 Time Left: {}".format(TotalTimeString) # And print that string instead of the original one + + + + + elif line.startswith(";TIME_ELAPSED:"): + + # As we didnt find the total time (";TIME:"), we have found a elapsed time mark + # This time represents the time the printer have printed. So with some math; + # totalTime - printTime = RemainingTime. + line_index = lines.index(line) # We get a hold of the line + myList = re.split(":", line) # Again, we split at ":" so we can get the number + StringMedTal = "{}".format(myList[1]) # Then we put that number from the list, into a string + + currentTime = float(StringMedTal) # This time we convert to a float, as the line looks something like: + # ;TIME_ELAPSED:1234.6789 + # which is total time in seconds + + timeLeft = TotalTime - currentTime # Here we calculate remaining time + + m1, s1 = divmod(timeLeft, 60) # And some math to get the total time in seconds into + h1, m1 = divmod(m1, 60) # the right format. (HH,MM,SS) + currentTimeString = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time + lines[line_index] = "M117 Time Left: {}".format(currentTimeString) # And now insert that into the GCODE + + + # Here we are OUT of the second for-loop + # Which means we have found and replaces all the occurences. + # Which also means we are ready to join the lines for that section of the GCODE file. + final_lines = "\n".join(lines) + data[layer_index] = final_lines + return data From fd3233dba59653101a349ad5dbe078e314f35dcd Mon Sep 17 00:00:00 2001 From: Mathias Lyngklip Kjeldgaard Date: Wed, 31 Jul 2019 23:29:35 +0200 Subject: [PATCH 085/994] updated variable names --- .../scripts/DisplayRemainingTimeOnLCD.py | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py index a943ca58f8..e5f61f7360 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py @@ -1,3 +1,13 @@ +# Cura PostProcessingPlugin +# Author: Mathias Lyngklip Kjeldgaard +# Date: July 31, 2019 +# Modified: --- + +# Description: This plugin displayes the remaining time on the LCD of the printer +# using the estimated print-time generated by Cura. + + + from ..Script import Script @@ -22,37 +32,36 @@ class DisplayRemainingTimeOnLCD(Script): "TurnOn": { "label": "Enable", - "description": "When enabled, It will write Time Left HHMMSS on the display", + "description": "When enabled, It will write Time Left: HHMMSS on the display", "type": "bool", - "default_value": true + "default_value": false } } }""" def execute(self, data): if self.getSettingValueByKey("TurnOn"): - TotalTime = 0 # Var for total time - TotalTimeString = "" # Var for the string we insert + total_time = 0 + total_time_string = "" for layer in data: layer_index = data.index(layer) lines = layer.split("\n") for line in lines: if line.startswith(";TIME:"): # At this point, we have found a line in the GCODE with ";TIME:" - # which is the indication of TotalTime. Looks like: ";TIME:1337", where + # which is the indication of total_time. Looks like: ";TIME:1337", where # 1337 is the total print time in seconds. - line_index = lines.index(line) # We take a hold of that line - minString = re.split(":", line) # Then we split it, so we can get the number + line_index = lines.index(line) # We take a hold of that line + split_string = re.split(":", line) # Then we split it, so we can get the number - StringMedTal = "{}".format(minString[1]) # Here we insert that number from the - # list into a string. + string_with_numbers = "{}".format(split_string[1]) # Here we insert that number from the + # list into a string. + total_time = int(string_with_numbers) # Only to contert it to a int. - TotalTime = int(StringMedTal) # Only to contert it to a int. - - m, s = divmod(TotalTime, 60) # Math to calculate - h, m = divmod(m, 60) # hours, minutes and seconds. - TotalTimeString = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string - lines[line_index] = "M117 Time Left: {}".format(TotalTimeString) # And print that string instead of the original one + m, s = divmod(total_time, 60) # Math to calculate + h, m = divmod(m, 60) # hours, minutes and seconds. + total_time_string = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string + lines[line_index] = "M117 Time Left: {}".format(total_time_string) # And print that string instead of the original one @@ -63,19 +72,18 @@ class DisplayRemainingTimeOnLCD(Script): # This time represents the time the printer have printed. So with some math; # totalTime - printTime = RemainingTime. line_index = lines.index(line) # We get a hold of the line - myList = re.split(":", line) # Again, we split at ":" so we can get the number - StringMedTal = "{}".format(myList[1]) # Then we put that number from the list, into a string + list_split = re.split(":", line) # Again, we split at ":" so we can get the number + string_with_numbers = "{}".format(list_split[1]) # Then we put that number from the list, into a string - currentTime = float(StringMedTal) # This time we convert to a float, as the line looks something like: - # ;TIME_ELAPSED:1234.6789 - # which is total time in seconds + current_time = float(string_with_numbers) # This time we convert to a float, as the line looks something like: + # ;TIME_ELAPSED:1234.6789 + # which is total time in seconds - timeLeft = TotalTime - currentTime # Here we calculate remaining time - - m1, s1 = divmod(timeLeft, 60) # And some math to get the total time in seconds into + time_left = total_time - current_time # Here we calculate remaining time + m1, s1 = divmod(time_left, 60) # And some math to get the total time in seconds into h1, m1 = divmod(m1, 60) # the right format. (HH,MM,SS) - currentTimeString = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time - lines[line_index] = "M117 Time Left: {}".format(currentTimeString) # And now insert that into the GCODE + current_time_string = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time + lines[line_index] = "M117 Time Left: {}".format(current_time_string) # And now insert that into the GCODE # Here we are OUT of the second for-loop From 9fda7bd0b97df3a31585ee6c5df2cd0898a068ee Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 5 Aug 2019 17:39:19 +0200 Subject: [PATCH 086/994] Rework container tree structure This sets up a few new classes, subclasses of ContainerNode. This is intended to simplify the current structure in the QualityManager. Contributes to issue CURA-6600. --- cura/Machines/ContainerNode.py | 93 ++++++++++++++++++---------------- cura/Machines/ContainerTree.py | 15 ++++++ cura/Machines/IntentNode.py | 19 +++++++ cura/Machines/MachineNode.py | 19 +++++++ cura/Machines/MaterialNode.py | 34 +++++-------- cura/Machines/VariantNode.py | 19 +++++++ 6 files changed, 136 insertions(+), 63 deletions(-) create mode 100644 cura/Machines/ContainerTree.py create mode 100644 cura/Machines/IntentNode.py create mode 100644 cura/Machines/MachineNode.py create mode 100644 cura/Machines/VariantNode.py diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index eef1c63127..7695296cbb 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -1,64 +1,71 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Any, Dict, Union, TYPE_CHECKING - -from collections import OrderedDict +from typing import Any, Dict, Optional from UM.ConfigurationErrorMessage import ConfigurationErrorMessage +from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Logger import Logger from UM.Settings.InstanceContainer import InstanceContainer +from UM.Decorators import deprecated - -## -# A metadata / container combination. Use getContainer() to get the container corresponding to the metadata. -# -# ContainerNode is a multi-purpose class. It has two main purposes: -# 1. It encapsulates an InstanceContainer. It contains that InstanceContainer's -# - metadata (Always) -# - container (lazy-loaded when needed) -# 2. It also serves as a node in a hierarchical InstanceContainer lookup table/tree. -# This is used in Variant, Material, and Quality Managers. +## A node in the container tree. It represents one container. # +# The container it represents is referenced by its container_id. During normal +# use of the tree, this container is not constructed. Only when parts of the +# tree need to get loaded in the container stack should it get constructed. class ContainerNode: - __slots__ = ("_metadata", "_container", "children_map") + ## Creates a new node for the container tree. + # \param container_id The ID of the container that this node should + # represent. + # \param parent The parent container node, if any. + def __init__(self, container_id: str, parent: Optional["ContainerNode"]) -> None: + self.container_id = container_id + self.parent = parent + self._container = None # type: Optional[InstanceContainer] + self.children_map = {} # type: Dict[str, ContainerNode] # Mapping from container ID to container node. - def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: - self._metadata = metadata - self._container = None # type: Optional[InstanceContainer] - self.children_map = OrderedDict() # type: ignore # This is because it's children are supposed to override it. - - ## Get an entry value from the metadata + ## Get an entry from the metadata of the container that this node contains. + # \param entry The metadata entry key to return. + # \param default If the metadata is not present or the container is not + # found, the value of this default is returned. + # \return The value of the metadata entry, or the default if it was not + # present. + @deprecated("Get the metadata from the container with the ID of this node yourself.", "4.3") def getMetaDataEntry(self, entry: str, default: Any = None) -> Any: - if self._metadata is None: + container_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.container_id) + if len(container_metadata) == 0: return default - return self._metadata.get(entry, default) + return container_metadata[0].get(entry, default) - def getMetadata(self) -> Dict[str, Any]: - if self._metadata is None: - return {} - return self._metadata + ## Get the child with the specified container ID. + # \param child_id The container ID to get from among the children. + # \return The child node, or ``None`` if no child is present with the + # specified ID. + @deprecated("Iterate over the children instead of requesting them one by one.", "4.3") + def getChildNode(self, child_id: str) -> Optional["ContainerNode"]: + return self.children_map.get(child_id) - def getChildNode(self, child_key: str) -> Optional["ContainerNode"]: - return self.children_map.get(child_key) + @deprecated("Use `.container` instead.", "4.3") + def getContainer(self) -> Optional[InstanceContainer]: + return self.container - def getContainer(self) -> Optional["InstanceContainer"]: - if self._metadata is None: - Logger.log("e", "Cannot get container for a ContainerNode without metadata.") - return None - - if self._container is None: - container_id = self._metadata["id"] - from UM.Settings.ContainerRegistry import ContainerRegistry - container_list = ContainerRegistry.getInstance().findInstanceContainers(id = container_id) - if not container_list: - Logger.log("e", "Failed to lazy-load container [{container_id}]. Cannot find it.".format(container_id = container_id)) + ## The container that this node's container ID refers to. + # + # This can be used to finally instantiate the container in order to put it + # in the container stack. + # \return A container. + @property + def container(self) -> Optional[InstanceContainer]: + if not self._container: + container_list = ContainerRegistry.getInstance().findInstanceContainers(id = self.container_id) + if len(container_list) == 0: + Logger.log("e", "Failed to lazy-load container [{container_id}]. Cannot find it.".format(container_id = self.container_id)) error_message = ConfigurationErrorMessage.getInstance() - error_message.addFaultyContainers(container_id) + error_message.addFaultyContainers(self.container_id) return None self._container = container_list[0] - return self._container def __str__(self) -> str: - return "%s[%s]" % (self.__class__.__name__, self.getMetaDataEntry("id")) + return "%s[%s]" % (self.__class__.__name__, self.container_id) \ No newline at end of file diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py new file mode 100644 index 0000000000..30c9b8f90d --- /dev/null +++ b/cura/Machines/ContainerTree.py @@ -0,0 +1,15 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from cura.Machines.MachineNode import MachineNode + +from typing import Dict + +## This class contains a look-up tree for which containers are available at +# which stages of configuration. +# +# The tree starts at the machine definitions. For every distinct definition +# there will be one machine node here. +class ContainerTree: + def __init__(self) -> None: + self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. \ No newline at end of file diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py new file mode 100644 index 0000000000..590cf646e4 --- /dev/null +++ b/cura/Machines/IntentNode.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import TYPE_CHECKING + +from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.MaterialNode import MaterialNode +from cura.Machines.QualityNode import QualityNode + +if TYPE_CHECKING: + from typing import Dict + +## This class represents an intent category in the container tree. +# +# This class has no more subnodes. +class IntentNode(ContainerNode): + def __init__(self, container_id: str, parent: QualityNode) -> None: + super().__init__(container_id, parent) + self.variants = {} # type: Dict[str, MaterialNode] # mapping variant IDs to their nodes. \ No newline at end of file diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py new file mode 100644 index 0000000000..7daaf10bf5 --- /dev/null +++ b/cura/Machines/MachineNode.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import TYPE_CHECKING + +from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.ContainerTree import ContainerTree +from cura.Machines.VariantNode import VariantNode + +if TYPE_CHECKING: + from typing import Dict + +## This class represents a machine in the container tree. +# +# The subnodes of these nodes are variants. +class MachineNode(ContainerNode): + def __init__(self, container_id: str) -> None: + super().__init__(container_id, None) + self.variants = {} # type: Dict[str, VariantNode] # mapping variant IDs to their nodes. \ No newline at end of file diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index a4dcb0564f..2ac063c977 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -1,25 +1,19 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict, Any -from collections import OrderedDict -from .ContainerNode import ContainerNode +from typing import TYPE_CHECKING +from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.QualityNode import QualityNode +from cura.Machines.VariantNode import VariantNode + +if TYPE_CHECKING: + from typing import Dict + +## Represents a material in the container tree. # -# A MaterialNode is a node in the material lookup tree/map/table. It contains 2 (extra) fields: -# - material_map: a one-to-one map of "material_root_id" to material_node. -# - children_map: the key-value map for child nodes of this node. This is used in a lookup tree. -# -# +# Its subcontainers are quality profiles. class MaterialNode(ContainerNode): - __slots__ = ("material_map", "children_map") - - def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: - super().__init__(metadata = metadata) - self.material_map = {} # type: Dict[str, MaterialNode] # material_root_id -> material_node - - # We overide this as we want to indicate that MaterialNodes can only contain other material nodes. - self.children_map = OrderedDict() # type: OrderedDict[str, "MaterialNode"] - - def getChildNode(self, child_key: str) -> Optional["MaterialNode"]: - return self.children_map.get(child_key) \ No newline at end of file + def __init__(self, container_id, parent: VariantNode) -> None: + super().__init__(container_id, parent) + self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. \ No newline at end of file diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py new file mode 100644 index 0000000000..93410f2a61 --- /dev/null +++ b/cura/Machines/VariantNode.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import TYPE_CHECKING + +from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.MachineNode import MachineNode +from cura.Machines.MaterialNode import MaterialNode + +if TYPE_CHECKING: + from typing import Dict + +## This class represents an extruder variant in the container tree. +# +# The subnodes of these nodes are materials. +class VariantNode(ContainerNode): + def __init__(self, container_id: str, parent: MachineNode) -> None: + super().__init__(container_id, parent) + self.variants = {} # type: Dict[str, MaterialNode] # mapping variant IDs to their nodes. \ No newline at end of file From e84a75094a88be194592a3a7c187e5d5765ed555 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 5 Aug 2019 17:49:21 +0200 Subject: [PATCH 087/994] Add a MachineNode once a definition for it gets loaded This means that we've added this machine. We need to pre-load all of the containers for that printer then. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 30c9b8f90d..ebb957b5f7 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -1,6 +1,9 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. +from UM.Settings.DefinitionContainer import DefinitionContainer +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.MachineNode import MachineNode from typing import Dict @@ -12,4 +15,15 @@ from typing import Dict # there will be one machine node here. class ContainerTree: def __init__(self) -> None: - self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. \ No newline at end of file + self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. + ContainerRegistry.getInstance().containerAdded.connect(self.machineAdded) + + ## When a printer gets added, we need to build up the tree for that container. + def machineAdded(self, definition_container: ContainerInterface): + if not isinstance(definition_container, DefinitionContainer): + return # Not our concern. + definition_id = definition_container.getId() + if definition_id in self.machines: + return # Already have this definition ID. + + self.machines[definition_id] = MachineNode(definition_id) \ No newline at end of file From 2565be01f322ad6cb76689eec9cd974cd0ece326 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 08:58:34 +0200 Subject: [PATCH 088/994] Add variants as they get added to the registry Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 4 ++-- cura/Machines/MachineNode.py | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index ebb957b5f7..43ddbb4e13 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -16,10 +16,10 @@ from typing import Dict class ContainerTree: def __init__(self) -> None: self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. - ContainerRegistry.getInstance().containerAdded.connect(self.machineAdded) + ContainerRegistry.getInstance().containerAdded.connect(self._machineAdded) ## When a printer gets added, we need to build up the tree for that container. - def machineAdded(self, definition_container: ContainerInterface): + def _machineAdded(self, definition_container: ContainerInterface): if not isinstance(definition_container, DefinitionContainer): return # Not our concern. definition_id = definition_container.getId() diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 7daaf10bf5..587960820a 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -3,8 +3,9 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode -from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantNode import VariantNode if TYPE_CHECKING: @@ -16,4 +17,24 @@ if TYPE_CHECKING: class MachineNode(ContainerNode): def __init__(self, container_id: str) -> None: super().__init__(container_id, None) - self.variants = {} # type: Dict[str, VariantNode] # mapping variant IDs to their nodes. \ No newline at end of file + self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. + container_registry = ContainerRegistry.getInstance() + container_registry.containerAdded.connect(self._variantAdded) + + # Find all the variants for this definition ID. + variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") + for variant in variants: + variant_name = variant["name"] + if variant_name not in self.variants: + self.variants[variant_name] = VariantNode(variant["id"], parent = self) + + ## When a variant gets added to the set of profiles, we need to update our + # tree here. + def _variantAdded(self, container: ContainerInterface): + if container.getMetaDataEntry("type") != "variant": + return # Not interested. + name = container.getMetaDataEntry("name") + if name in self.variants: + return # Already have this one. + + self.variants[name] = VariantNode(container.getId(), parent = self) \ No newline at end of file From 65b1a43e88c1d445cc7a6206f3b709b93dfa5a74 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 09:16:41 +0200 Subject: [PATCH 089/994] Load tree when all metadata has been loaded This should build up the tree initially. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 13 ++++++++++++- cura/Machines/MachineNode.py | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 43ddbb4e13..adc79b1116 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -16,7 +16,18 @@ from typing import Dict class ContainerTree: def __init__(self) -> None: self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. - ContainerRegistry.getInstance().containerAdded.connect(self._machineAdded) + container_registry = ContainerRegistry.getInstance() + container_registry.allMetadataLoaded.connect(self._reloadAll) + container_registry.containerAdded.connect(self._machineAdded) + self._reloadAll() + + ## (Re)builds the initial container tree. + def _reloadAll(self): + all_stacks = ContainerRegistry.getInstance().findContainerStacks() + for stack in all_stacks: + definition_id = stack.definition.getId() + if definition_id not in self.machines: + self.machines[definition_id] = MachineNode(definition_id) ## When a printer gets added, we need to build up the tree for that container. def _machineAdded(self, definition_container: ContainerInterface): diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 587960820a..a062f0eae0 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -19,10 +19,14 @@ class MachineNode(ContainerNode): super().__init__(container_id, None) self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() + container_registry.allMetadataLoaded.connect(self._reloadAll) container_registry.containerAdded.connect(self._variantAdded) + self._reloadAll() + ## (Re)loads all variants under this printer. + def _reloadAll(self): # Find all the variants for this definition ID. - variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") + variants = ContainerRegistry.getInstance().findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") for variant in variants: variant_name = variant["name"] if variant_name not in self.variants: From b46d4eb2b5b02745274a83707be43eee2febcad2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 15:11:16 +0200 Subject: [PATCH 090/994] Have variant nodes build their own children When a variant and a variant love each other... Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 ++ cura/Machines/VariantNode.py | 64 +++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index a062f0eae0..65aab19d72 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -3,6 +3,7 @@ from typing import TYPE_CHECKING +from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode @@ -19,6 +20,7 @@ class MachineNode(ContainerNode): super().__init__(container_id, None) self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() + self.has_machine_materials = parseBool(container_registry.findContainersMetadata(id = container_id)[0].get("has_machine_materials", "true")) container_registry.allMetadataLoaded.connect(self._reloadAll) container_registry.containerAdded.connect(self._variantAdded) self._reloadAll() diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 93410f2a61..bd2bb63862 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -3,6 +3,8 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MachineNode import MachineNode from cura.Machines.MaterialNode import MaterialNode @@ -13,7 +15,67 @@ if TYPE_CHECKING: ## This class represents an extruder variant in the container tree. # # The subnodes of these nodes are materials. +# +# This node contains materials with ALL filament diameters underneath it. The +# tree of this variant is not specific to one global stack, so because the +# list of materials can be different per stack depending on the compatible +# material diameter setting, we cannot filter them here. Filtering must be +# done in the model. class VariantNode(ContainerNode): def __init__(self, container_id: str, parent: MachineNode) -> None: super().__init__(container_id, parent) - self.variants = {} # type: Dict[str, MaterialNode] # mapping variant IDs to their nodes. \ No newline at end of file + self.materials = {} # type: Dict[str, MaterialNode] # Mapping material base files to their nodes. + container_registry = ContainerRegistry.getInstance() + self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] #Store our own name so that we can filter more easily. + container_registry.allMetadataLoaded.connect(self._reloadAll) + container_registry.containerAdded.connect(self._materialAdded) + self._reloadAll() + + ## (Re)loads all materials under this variant. + def _reloadAll(self): + container_registry = ContainerRegistry.getInstance() + # Find all the materials for this variant's name. + if not self.parent.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. + materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") # These are ONLY the base materials. + else: # Printer has its own material profiles. Look for material profiles with this printer's definition. + all_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") + printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.parent.container_id) + variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.parent.container_id, variant = self.variant_name) + materials_per_base_file = {material["base_file"]: material for material in all_materials} + materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. + materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. + materials = materials_per_base_file.values() + + for material in materials: + base_file = material["base_file"] + if base_file not in self.materials: + self.materials[base_file] = MaterialNode(material["id"], parent = self) + + ## When a material gets added to the set of profiles, we need to update our + # tree here. + def _materialAdded(self, container: ContainerInterface): + if container.getMetaDataEntry("type") != "material": + return # Not interested. + material_definition = container.getMetaDataEntry("definition") + if not self.parent.has_machine_materials: + if material_definition != "fdmprinter": + return + base_file = container.getMetaDataEntry("base_file") + if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. + if material_definition != "fdmprinter" and material_definition != self.parent.container_id: + return + material_variant = container.getMetaDataEntry("variant", "empty") + if material_variant != "empty" and material_variant != self.variant_name: + return + else: # We already have this base profile. Replace the base profile if the new one is more specific. + new_definition = container.getMetaDataEntry("definition") + if new_definition == "fdmprinter": + return # Just as unspecific or worse. + if new_definition != self.parent.container_id: + return # Doesn't match this set-up. + original_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.materials[base_file].container_id)[0] + original_variant = original_metadata.get("variant", "empty") + if original_variant != "empty" or container.getMetaDataEntry("variant", "empty") == "empty": + return # Original was already specific or just as unspecific as the new one. + + self.materials[base_file] = MaterialNode(container.getId(), parent = self) \ No newline at end of file From bc3300baa84d539a7eee787eee20880df35b77fc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 15:13:29 +0200 Subject: [PATCH 091/994] Assume that the tree is always constructed after metadata has been loaded Safe assumption, since the tree can only start constructing after the stacks are loaded. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 5 ++--- cura/Machines/VariantNode.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 65aab19d72..bdab9a8c8e 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -21,12 +21,11 @@ class MachineNode(ContainerNode): self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() self.has_machine_materials = parseBool(container_registry.findContainersMetadata(id = container_id)[0].get("has_machine_materials", "true")) - container_registry.allMetadataLoaded.connect(self._reloadAll) container_registry.containerAdded.connect(self._variantAdded) - self._reloadAll() + self._loadAll() ## (Re)loads all variants under this printer. - def _reloadAll(self): + def _loadAll(self): # Find all the variants for this definition ID. variants = ContainerRegistry.getInstance().findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") for variant in variants: diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index bd2bb63862..889f4ad940 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -27,12 +27,11 @@ class VariantNode(ContainerNode): self.materials = {} # type: Dict[str, MaterialNode] # Mapping material base files to their nodes. container_registry = ContainerRegistry.getInstance() self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] #Store our own name so that we can filter more easily. - container_registry.allMetadataLoaded.connect(self._reloadAll) container_registry.containerAdded.connect(self._materialAdded) - self._reloadAll() + self._loadAll() ## (Re)loads all materials under this variant. - def _reloadAll(self): + def _loadAll(self): container_registry = ContainerRegistry.getInstance() # Find all the materials for this variant's name. if not self.parent.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. From 3ef0b4292d07ceca91ec75ca2ffbff00be355844 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 15:15:02 +0200 Subject: [PATCH 092/994] Only add variants that fit on my machine Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index bdab9a8c8e..c8906312d0 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -41,5 +41,9 @@ class MachineNode(ContainerNode): name = container.getMetaDataEntry("name") if name in self.variants: return # Already have this one. + if container.getMetaDataEntry("hardware_type") != "nozzle": + return # Only want nozzles in my tree. + if container.getMetaDataEntry("definition") != self.container_id: + return # Not a nozzle that fits in my machine. self.variants[name] = VariantNode(container.getId(), parent = self) \ No newline at end of file From 24346fc8e3b35e5c5c0e97683e4c1b5da3c049b8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 15:21:52 +0200 Subject: [PATCH 093/994] Don't add materials forbidden by the printer definition Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 +++- cura/Machines/VariantNode.py | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index c8906312d0..77b16def00 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -20,7 +20,9 @@ class MachineNode(ContainerNode): super().__init__(container_id, None) self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() - self.has_machine_materials = parseBool(container_registry.findContainersMetadata(id = container_id)[0].get("has_machine_materials", "true")) + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "true")) + self.exclude_materials = my_metadata.get("exclude_materials", []) container_registry.containerAdded.connect(self._variantAdded) self._loadAll() diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 889f4ad940..9f6de7be35 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -45,6 +45,9 @@ class VariantNode(ContainerNode): materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. materials = materials_per_base_file.values() + for excluded_material in self.parent.exclude_materials: + del materials[excluded_material] + for material in materials: base_file = material["base_file"] if base_file not in self.materials: @@ -60,6 +63,8 @@ class VariantNode(ContainerNode): if material_definition != "fdmprinter": return base_file = container.getMetaDataEntry("base_file") + if base_file in self.parent.exclude_materials: + return # Material is forbidden for this printer. if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. if material_definition != "fdmprinter" and material_definition != self.parent.container_id: return From d3dc36c1878398f0c61627db103e55701bab73cb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 16:19:30 +0200 Subject: [PATCH 094/994] Find quality nodes as subnodes of material nodes Similar to the materials and variants. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 +++- cura/Machines/MaterialNode.py | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 77b16def00..5423e44cfb 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -21,7 +21,9 @@ class MachineNode(ContainerNode): self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] - self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "true")) + self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) + self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) + self.quality_definition = my_metadata.get("quality_definition", container_id) self.exclude_materials = my_metadata.get("exclude_materials", []) container_registry.containerAdded.connect(self._variantAdded) self._loadAll() diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 2ac063c977..9008e9759b 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -3,6 +3,8 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode @@ -16,4 +18,35 @@ if TYPE_CHECKING: class MaterialNode(ContainerNode): def __init__(self, container_id, parent: VariantNode) -> None: super().__init__(container_id, parent) - self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. \ No newline at end of file + self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. + container_registry = ContainerRegistry.getInstance() + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + self.base_file = my_metadata["base_file"] + container_registry.containerAdded.connect(self._qualityAdded) + self._loadAll() + + def _loadAll(self) -> None: + container_registry = ContainerRegistry.getInstance() + # Find all quality profiles that fit on this material. + if not self.parent.parent.has_machine_quality: # Need to find the global qualities. + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") + else: + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.parent.parent.quality_definition, variant = self.parent.variant_name, material = self.base_file) + + for quality in qualities: + quality_id = quality["id"] + if quality_id not in self.qualities: + self.qualities[quality_id] = QualityNode(quality_id, parent = self) + + def _qualityAdded(self, container: ContainerInterface) -> None: + if container.getMetaDataEntry("type") != "quality": + return # Not interested. + if not self.parent.parent.has_machine_quality: + if container.getMetaDataEntry("definition") != "fdmprinter": + return # Only want global qualities. + else: + if container.getMetaDataEntry("definition") != self.parent.parent.quality_definition or container.getMetaDataEntry("variant") != self.parent.variant_name or container.getMetaDataEntry("material") != self.base_file: + return # Doesn't match our configuration. + + quality_id = container.getId() + self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file From 8ec1c31b581be19eda33bccae408e37eca73a5b4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 16:31:57 +0200 Subject: [PATCH 095/994] Don't make parent a common property Instead we use properly-typed and appropriately-named variables in each of the sub classes. Contributes to issue CURA-6600. --- cura/Machines/ContainerNode.py | 4 +--- cura/Machines/MachineNode.py | 6 +++--- cura/Machines/MaterialNode.py | 17 +++++++++-------- cura/Machines/VariantNode.py | 27 ++++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 7695296cbb..8fd381a7fb 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -18,10 +18,8 @@ class ContainerNode: ## Creates a new node for the container tree. # \param container_id The ID of the container that this node should # represent. - # \param parent The parent container node, if any. - def __init__(self, container_id: str, parent: Optional["ContainerNode"]) -> None: + def __init__(self, container_id: str) -> None: self.container_id = container_id - self.parent = parent self._container = None # type: Optional[InstanceContainer] self.children_map = {} # type: Dict[str, ContainerNode] # Mapping from container ID to container node. diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 5423e44cfb..1a2369ecd2 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: # The subnodes of these nodes are variants. class MachineNode(ContainerNode): def __init__(self, container_id: str) -> None: - super().__init__(container_id, None) + super().__init__(container_id) self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] @@ -35,7 +35,7 @@ class MachineNode(ContainerNode): for variant in variants: variant_name = variant["name"] if variant_name not in self.variants: - self.variants[variant_name] = VariantNode(variant["id"], parent = self) + self.variants[variant_name] = VariantNode(variant["id"], machine = self) ## When a variant gets added to the set of profiles, we need to update our # tree here. @@ -50,4 +50,4 @@ class MachineNode(ContainerNode): if container.getMetaDataEntry("definition") != self.container_id: return # Not a nozzle that fits in my machine. - self.variants[name] = VariantNode(container.getId(), parent = self) \ No newline at end of file + self.variants[name] = VariantNode(container.getId(), machine = self) \ No newline at end of file diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 9008e9759b..e61f3f363d 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -16,8 +16,9 @@ if TYPE_CHECKING: # # Its subcontainers are quality profiles. class MaterialNode(ContainerNode): - def __init__(self, container_id, parent: VariantNode) -> None: - super().__init__(container_id, parent) + def __init__(self, container_id, variant: VariantNode) -> None: + super().__init__(container_id) + self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] @@ -28,25 +29,25 @@ class MaterialNode(ContainerNode): def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all quality profiles that fit on this material. - if not self.parent.parent.has_machine_quality: # Need to find the global qualities. + if not self.variant.machine.has_machine_quality: # Need to find the global qualities. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") else: - qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.parent.parent.quality_definition, variant = self.parent.variant_name, material = self.base_file) + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.base_file) for quality in qualities: quality_id = quality["id"] if quality_id not in self.qualities: - self.qualities[quality_id] = QualityNode(quality_id, parent = self) + self.qualities[quality_id] = QualityNode(quality_id, material = self) def _qualityAdded(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "quality": return # Not interested. - if not self.parent.parent.has_machine_quality: + if not self.variant.machine.has_machine_quality: if container.getMetaDataEntry("definition") != "fdmprinter": return # Only want global qualities. else: - if container.getMetaDataEntry("definition") != self.parent.parent.quality_definition or container.getMetaDataEntry("variant") != self.parent.variant_name or container.getMetaDataEntry("material") != self.base_file: + if container.getMetaDataEntry("definition") != self.variant.machine.quality_definition or container.getMetaDataEntry("variant") != self.variant.variant_name or container.getMetaDataEntry("material") != self.base_file: return # Doesn't match our configuration. quality_id = container.getId() - self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file + self.qualities[quality_id] = QualityNode(quality_id, material = self) \ No newline at end of file diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 9f6de7be35..716f44d6cf 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -22,11 +22,12 @@ if TYPE_CHECKING: # material diameter setting, we cannot filter them here. Filtering must be # done in the model. class VariantNode(ContainerNode): - def __init__(self, container_id: str, parent: MachineNode) -> None: - super().__init__(container_id, parent) + def __init__(self, container_id: str, machine: MachineNode) -> None: + super().__init__(container_id) + self.machine = machine self.materials = {} # type: Dict[str, MaterialNode] # Mapping material base files to their nodes. container_registry = ContainerRegistry.getInstance() - self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] #Store our own name so that we can filter more easily. + self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] # Store our own name so that we can filter more easily. container_registry.containerAdded.connect(self._materialAdded) self._loadAll() @@ -34,24 +35,24 @@ class VariantNode(ContainerNode): def _loadAll(self): container_registry = ContainerRegistry.getInstance() # Find all the materials for this variant's name. - if not self.parent.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. + if not self.machine.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") # These are ONLY the base materials. else: # Printer has its own material profiles. Look for material profiles with this printer's definition. all_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") - printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.parent.container_id) - variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.parent.container_id, variant = self.variant_name) + printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id) + variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant = self.variant_name) materials_per_base_file = {material["base_file"]: material for material in all_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. materials = materials_per_base_file.values() - for excluded_material in self.parent.exclude_materials: + for excluded_material in self.machine.exclude_materials: del materials[excluded_material] for material in materials: base_file = material["base_file"] if base_file not in self.materials: - self.materials[base_file] = MaterialNode(material["id"], parent = self) + self.materials[base_file] = MaterialNode(material["id"], variant = self) ## When a material gets added to the set of profiles, we need to update our # tree here. @@ -59,14 +60,14 @@ class VariantNode(ContainerNode): if container.getMetaDataEntry("type") != "material": return # Not interested. material_definition = container.getMetaDataEntry("definition") - if not self.parent.has_machine_materials: + if not self.machine.has_machine_materials: if material_definition != "fdmprinter": return base_file = container.getMetaDataEntry("base_file") - if base_file in self.parent.exclude_materials: + if base_file in self.machine.exclude_materials: return # Material is forbidden for this printer. if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. - if material_definition != "fdmprinter" and material_definition != self.parent.container_id: + if material_definition != "fdmprinter" and material_definition != self.machine.container_id: return material_variant = container.getMetaDataEntry("variant", "empty") if material_variant != "empty" and material_variant != self.variant_name: @@ -75,11 +76,11 @@ class VariantNode(ContainerNode): new_definition = container.getMetaDataEntry("definition") if new_definition == "fdmprinter": return # Just as unspecific or worse. - if new_definition != self.parent.container_id: + if new_definition != self.machine.container_id: return # Doesn't match this set-up. original_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.materials[base_file].container_id)[0] original_variant = original_metadata.get("variant", "empty") if original_variant != "empty" or container.getMetaDataEntry("variant", "empty") == "empty": return # Original was already specific or just as unspecific as the new one. - self.materials[base_file] = MaterialNode(container.getId(), parent = self) \ No newline at end of file + self.materials[base_file] = MaterialNode(container.getId(), variant = self) \ No newline at end of file From a0d3cb67426508adf5e990dd9e4e4d53943fa2dc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 16:46:28 +0200 Subject: [PATCH 096/994] Make QualityNode part of our normal tree structure It now constructs itself and its contents automatically. No need for a QualityManager to keep it up to date any more. Contributes to issue CURA-6600. --- cura/Machines/QualityNode.py | 64 ++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 991388a4bd..ba17090e7f 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -1,38 +1,44 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict, cast, Any +from typing import TYPE_CHECKING -from .ContainerNode import ContainerNode -from .QualityChangesGroup import QualityChangesGroup +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.Interfaces import ContainerInterface +from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.IntentNode import IntentNode +from cura.Machines.MaterialNode import MaterialNode +if TYPE_CHECKING: + from typing import Dict +## Represents a material profile in the container tree. # -# QualityNode is used for BOTH quality and quality_changes containers. -# +# Its subcontainers are intent profiles. class QualityNode(ContainerNode): + def __init__(self, container_id: str, material: MaterialNode) -> None: + super().__init__(container_id) + self.material = material + self.intents = {} # type: Dict[str, IntentNode] + ContainerRegistry.getInstance().containerAdded.connect(self._intentAdded) + self._loadAll() - def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: - super().__init__(metadata = metadata) - self.quality_type_map = {} # type: Dict[str, QualityNode] # quality_type -> QualityNode for InstanceContainer + def _loadAll(self) -> None: + container_registry = ContainerRegistry.getInstance() + # Find all intent profiles that fit the current configuration. + for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.material.variant.machine.quality_definition, variant = self.material.variant.variant_name, material = self.material.base_file): + self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) - def getChildNode(self, child_key: str) -> Optional["QualityNode"]: - return self.children_map.get(child_key) - - def addQualityMetadata(self, quality_type: str, metadata: Dict[str, Any]): - if quality_type not in self.quality_type_map: - self.quality_type_map[quality_type] = QualityNode(metadata) - - def getQualityNode(self, quality_type: str) -> Optional["QualityNode"]: - return self.quality_type_map.get(quality_type) - - def addQualityChangesMetadata(self, quality_type: str, metadata: Dict[str, Any]): - if quality_type not in self.quality_type_map: - self.quality_type_map[quality_type] = QualityNode() - quality_type_node = self.quality_type_map[quality_type] - - name = metadata["name"] - if name not in quality_type_node.children_map: - quality_type_node.children_map[name] = QualityChangesGroup(name, quality_type) - quality_changes_group = quality_type_node.children_map[name] - cast(QualityChangesGroup, quality_changes_group).addNode(QualityNode(metadata)) + def _intentAdded(self, container: ContainerInterface) -> None: + if container.getMetaDataEntry("type") != "intent": + return # Not interested if it's not an intent. + if container.getMetaDataEntry("definition") != self.material.variant.machine.quality_definition: + return # Incorrect printer. + if container.getMetaDataEntry("variant") != self.material.variant.variant_name: + return # Incorrect variant. + if container.getMetaDataEntry("material") != self.material.base_file: + return # Incorrect material. + container_id = container.getId() + if container_id in self.intents: + return # Already have this. + self.intents[container_id] = IntentNode(container_id, quality = self) \ No newline at end of file From b05784e607280cf519d12ba345c5b8ec0692bd29 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 16:49:06 +0200 Subject: [PATCH 097/994] Remove subprofiles from intent nodes As the documentation says, it has no subprofiles any more. Contributes to issue CURA-6600. --- cura/Machines/IntentNode.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index 590cf646e4..d6ec0f0c3f 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -1,19 +1,13 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING - from cura.Machines.ContainerNode import ContainerNode -from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityNode import QualityNode -if TYPE_CHECKING: - from typing import Dict - -## This class represents an intent category in the container tree. +## This class represents an intent profile in the container tree. # # This class has no more subnodes. class IntentNode(ContainerNode): - def __init__(self, container_id: str, parent: QualityNode) -> None: - super().__init__(container_id, parent) - self.variants = {} # type: Dict[str, MaterialNode] # mapping variant IDs to their nodes. \ No newline at end of file + def __init__(self, container_id: str, quality: QualityNode) -> None: + super().__init__(container_id) + self.quality = quality \ No newline at end of file From 8e49991087b01aba5faf3fd517f2a946169b8dda Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 17:04:29 +0200 Subject: [PATCH 098/994] Resolve circular imports Some of these are only used for the type checks. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 7 +++---- cura/Machines/IntentNode.py | 8 ++++++-- cura/Machines/MaterialNode.py | 4 ++-- cura/Machines/QualityManager.py | 13 +++++++++++++ cura/Machines/QualityNode.py | 4 ++-- cura/Machines/VariantNode.py | 4 ++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index adc79b1116..14c54459a3 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -17,12 +17,11 @@ class ContainerTree: def __init__(self) -> None: self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. container_registry = ContainerRegistry.getInstance() - container_registry.allMetadataLoaded.connect(self._reloadAll) container_registry.containerAdded.connect(self._machineAdded) - self._reloadAll() + self._loadAll() - ## (Re)builds the initial container tree. - def _reloadAll(self): + ## Builds the initial container tree. + def _loadAll(self): all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: definition_id = stack.definition.getId() diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index d6ec0f0c3f..232498536c 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -1,13 +1,17 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import TYPE_CHECKING + from cura.Machines.ContainerNode import ContainerNode -from cura.Machines.QualityNode import QualityNode + +if TYPE_CHECKING: + from cura.Machines.QualityNode import QualityNode ## This class represents an intent profile in the container tree. # # This class has no more subnodes. class IntentNode(ContainerNode): - def __init__(self, container_id: str, quality: QualityNode) -> None: + def __init__(self, container_id: str, quality: "QualityNode") -> None: super().__init__(container_id) self.quality = quality \ No newline at end of file diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index e61f3f363d..51dc62837a 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -7,16 +7,16 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode -from cura.Machines.VariantNode import VariantNode if TYPE_CHECKING: from typing import Dict + from cura.Machines.VariantNode import VariantNode ## Represents a material in the container tree. # # Its subcontainers are quality profiles. class MaterialNode(ContainerNode): - def __init__(self, container_id, variant: VariantNode) -> None: + def __init__(self, container_id, variant: "VariantNode") -> None: super().__init__(container_id) self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index b4f8b8f679..a13b3e1f57 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -12,6 +12,7 @@ from UM.Settings.InstanceContainer import InstanceContainer from cura.Settings.ExtruderStack import ExtruderStack +from cura.Machines.ContainerTree import ContainerTree from .QualityGroup import QualityGroup from .QualityNode import QualityNode @@ -66,6 +67,18 @@ class QualityManager(QObject): self._update_timer.timeout.connect(self._updateMaps) def initialize(self) -> None: + container_tree = ContainerTree() + for machine_id, machine in container_tree.machines.items(): + print("--", machine_id) + for variant_name, variant in machine.variants.items(): + print("-- --", variant_name) + for material_base_file, material in variant.materials.items(): + print("-- -- --", material_base_file) + for quality_id, quality in material.qualities.items(): + print("-- -- -- --", quality_id) + for intent_id in quality.intents: + print("-- -- -- -- --", intent_id) + # Initialize the lookup tree for quality profiles with following structure: # -> -> -> # -> diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index ba17090e7f..5c5f1264aa 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -7,16 +7,16 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.IntentNode import IntentNode -from cura.Machines.MaterialNode import MaterialNode if TYPE_CHECKING: from typing import Dict + from cura.Machines.MaterialNode import MaterialNode ## Represents a material profile in the container tree. # # Its subcontainers are intent profiles. class QualityNode(ContainerNode): - def __init__(self, container_id: str, material: MaterialNode) -> None: + def __init__(self, container_id: str, material: "MaterialNode") -> None: super().__init__(container_id) self.material = material self.intents = {} # type: Dict[str, IntentNode] diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 716f44d6cf..ca3bfc9624 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -6,11 +6,11 @@ from typing import TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode -from cura.Machines.MachineNode import MachineNode from cura.Machines.MaterialNode import MaterialNode if TYPE_CHECKING: from typing import Dict + from cura.Machines.MachineNode import MachineNode ## This class represents an extruder variant in the container tree. # @@ -22,7 +22,7 @@ if TYPE_CHECKING: # material diameter setting, we cannot filter them here. Filtering must be # done in the model. class VariantNode(ContainerNode): - def __init__(self, container_id: str, machine: MachineNode) -> None: + def __init__(self, container_id: str, machine: "MachineNode") -> None: super().__init__(container_id) self.machine = machine self.materials = {} # type: Dict[str, MaterialNode] # Mapping material base files to their nodes. From accc4ccd2147d012d6fa26fbe915b3e5a105db5c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 7 Aug 2019 09:50:53 +0200 Subject: [PATCH 099/994] Only remove excluded materials that were added Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 11 ----------- cura/Machines/VariantNode.py | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index a13b3e1f57..a4386dde74 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -67,17 +67,6 @@ class QualityManager(QObject): self._update_timer.timeout.connect(self._updateMaps) def initialize(self) -> None: - container_tree = ContainerTree() - for machine_id, machine in container_tree.machines.items(): - print("--", machine_id) - for variant_name, variant in machine.variants.items(): - print("-- --", variant_name) - for material_base_file, material in variant.materials.items(): - print("-- -- --", material_base_file) - for quality_id, quality in material.qualities.items(): - print("-- -- -- --", quality_id) - for intent_id in quality.intents: - print("-- -- -- -- --", intent_id) # Initialize the lookup tree for quality profiles with following structure: # -> -> -> diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index ca3bfc9624..a29a3b6aa9 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -47,7 +47,8 @@ class VariantNode(ContainerNode): materials = materials_per_base_file.values() for excluded_material in self.machine.exclude_materials: - del materials[excluded_material] + if excluded_material in materials: + del materials[excluded_material] for material in materials: base_file = material["base_file"] From a241425aafddb1da724a209dbb38b9c967302eb4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 15:35:22 +0200 Subject: [PATCH 100/994] Add test for ContainerTree CURA-6600 --- tests/Machines/TestContainerTree.py | 52 +++++++++++++++++++++++++++++ tests/TestMaterialManager.py | 4 ++- tests/TestQualityManager.py | 3 ++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 tests/Machines/TestContainerTree.py diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py new file mode 100644 index 0000000000..6ad54ecc49 --- /dev/null +++ b/tests/Machines/TestContainerTree.py @@ -0,0 +1,52 @@ +from unittest.mock import patch, MagicMock +import pytest +from UM.Settings.DefinitionContainer import DefinitionContainer +from cura.Machines.ContainerTree import ContainerTree + + +def createMockedStack(definition_id: str): + result = MagicMock() + result.definition.getId = MagicMock(return_value = definition_id) + return result + + +@pytest.fixture +def container_registry(): + result = MagicMock() + result.findContainerStacks = MagicMock(return_value=[createMockedStack("machine_1"), createMockedStack("machine_2")]) + return result + + +def test_containerTreeInit(container_registry): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + container_tree = ContainerTree() + + assert "machine_1" in container_tree.machines + assert "machine_2" in container_tree.machines + + +def test_newMachineAdded(container_registry): + mocked_definition_container = MagicMock(spec=DefinitionContainer) + mocked_definition_container.getId = MagicMock(return_value = "machine_3") + + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + container_tree = ContainerTree() + # machine_3 shouldn't be there, as on init it wasn't in the registry + assert "machine_3" not in container_tree.machines + + # But when it does get added (by manually triggering the _machineAdded), it should be there. + container_tree._machineAdded(mocked_definition_container) + assert "machine_3" in container_tree.machines + + +def test_alreadyKnownMachineAdded(container_registry): + mocked_definition_container = MagicMock(spec=DefinitionContainer) + mocked_definition_container.getId = MagicMock(return_value="machine_2") + + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + container_tree = ContainerTree() + assert len(container_tree.machines) == 2 + + # The ID is already there, so no machine should be added. + container_tree._machineAdded(mocked_definition_container) + assert len(container_tree.machines) == 2 diff --git a/tests/TestMaterialManager.py b/tests/TestMaterialManager.py index 92380d40ae..e0569196f1 100644 --- a/tests/TestMaterialManager.py +++ b/tests/TestMaterialManager.py @@ -1,5 +1,5 @@ from unittest.mock import MagicMock, patch - +import pytest from cura.Machines.MaterialManager import MaterialManager @@ -13,6 +13,8 @@ mocked_definition = MagicMock() mocked_definition.getId = MagicMock(return_value = "fdmmachine") mocked_definition.getMetaDataEntry = MagicMock(return_value = []) +# These tests are outdated +pytestmark = pytest.mark.skip def test_initialize(application): # Just test if the simple loading works diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py index 50318260b2..f7c54202e0 100644 --- a/tests/TestQualityManager.py +++ b/tests/TestQualityManager.py @@ -15,6 +15,9 @@ mocked_material.getMetaDataEntry = MagicMock(return_value = "base_material") mocked_extruder.material = mocked_material mocked_stack.extruders = {"0": mocked_extruder} +# These tests are outdated +pytestmark = pytest.mark.skip + @pytest.fixture() def material_manager(): result = MagicMock() From fa077038fc0233ef94476e6f68b78b3845a9328d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 16:17:46 +0200 Subject: [PATCH 101/994] Add tests for the MachineNode --- tests/Machines/TestMachineNode.py | 61 +++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 tests/Machines/TestMachineNode.py diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py new file mode 100644 index 0000000000..d0fe8c65ba --- /dev/null +++ b/tests/Machines/TestMachineNode.py @@ -0,0 +1,61 @@ +from unittest.mock import patch, MagicMock +import pytest + +from UM.Settings.Interfaces import ContainerInterface +from cura.Machines.MachineNode import MachineNode + + +machine_node_variant_added_test_data = [({"type": "Not a variant!"}, ["Variant One", "Variant Two"]), # Wrong type + ({"type": "variant", "name": "Variant One"}, ["Variant One", "Variant Two"]), # Name already added + ({"type": "variant", "name": "Variant Three", "hardware_type": "Not a nozzle"}, ["Variant One", "Variant Two"]), # Wrong hardware type + ({"type": "variant", "name": "Variant Three", "hardware_type": "nozzle", "definition": "machine_3"}, ["Variant One", "Variant Two"]), # Wrong definition ID + ({"type": "variant", "name": "Variant Three", "hardware_type": "nozzle", "definition": "machine_1"}, ["Variant One", "Variant Two", "Variant Three"])] # Yay! It's finally added + + +metadata_dict = {} + + +@pytest.fixture +def container_registry(): + result = MagicMock() + result.findInstanceContainersMetadata = MagicMock(return_value = [{"id": "variant_1", "name": "Variant One"}, {"id": "variant_2", "name": "Variant Two"}]) + return result + + +def getMetadataEntrySideEffect(*args, **kwargs): + return metadata_dict.get(args[0]) + + +def createMockedInstanceContainer(): + result = MagicMock(spec = ContainerInterface) + result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) + return result + + +def createMachineNode(container_id, container_registry): + with patch("cura.Machines.MachineNode.VariantNode"): # We're not testing the variant node here, so patch it out. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + return MachineNode(container_id) + + +def test_machineNodeInit(container_registry): + machine_node = createMachineNode("machine_1", container_registry) + + # As variants get stored by name, we want to check if those get added. + assert "Variant One" in machine_node.variants + assert "Variant Two" in machine_node.variants + assert len(machine_node.variants) == 2 # And ensure that *only* those two got added. + + +@pytest.mark.parametrize("metadata,variant_result_list", machine_node_variant_added_test_data) +def test_machineNodeVariantAdded(container_registry, metadata, variant_result_list): + machine_node = createMachineNode("machine_1", container_registry) + + with patch("cura.Machines.MachineNode.VariantNode"): # We're not testing the variant node here, so patch it out. + with patch.dict(metadata_dict, metadata): + mocked_container = createMockedInstanceContainer() + machine_node._variantAdded(mocked_container) + + assert len(variant_result_list) == len(machine_node.variants) + for name in variant_result_list: + assert name in machine_node.variants \ No newline at end of file From 6e5b0bb6091d11d06ac944405971077127465707 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 17:03:41 +0200 Subject: [PATCH 102/994] Fix the filtering of materials based on exclude_materials CURA-6600 --- cura/Machines/VariantNode.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index a29a3b6aa9..9d170933c5 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -46,11 +46,12 @@ class VariantNode(ContainerNode): materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. materials = materials_per_base_file.values() - for excluded_material in self.machine.exclude_materials: - if excluded_material in materials: - del materials[excluded_material] - + filtered_materials = [] for material in materials: + if material["id"] not in self.machine.exclude_materials: + filtered_materials.append(material) + + for material in filtered_materials: base_file = material["base_file"] if base_file not in self.materials: self.materials[base_file] = MaterialNode(material["id"], variant = self) From 2683c31975843bd5400b68eeef7254d7e7c74222 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 17:04:39 +0200 Subject: [PATCH 103/994] Add initial tests for variantNode CURA-6600 --- tests/Machines/TestVariantNode.py | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tests/Machines/TestVariantNode.py diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py new file mode 100644 index 0000000000..7c0d7c901d --- /dev/null +++ b/tests/Machines/TestVariantNode.py @@ -0,0 +1,54 @@ +from unittest.mock import patch, MagicMock +import pytest + +from cura.Machines.VariantNode import VariantNode + + +metadata_dict = {"fdmprinter": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}, + "machine_1": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}], + "Variant One": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}} + + +def getMetadataEntrySideEffect(*args, **kwargs): + variant = kwargs.get("variant") + definition = kwargs.get("definition") + + if variant is not None: + return metadata_dict.get(definition).get(variant) + return metadata_dict.get(definition).get("no_variant") + + +@pytest.fixture +def machine_node(): + mocked_machine_node = MagicMock() + mocked_machine_node.container_id = "machine_1" + return mocked_machine_node + + +@pytest.fixture +def container_registry(): + result = MagicMock() + result.findInstanceContainersMetadata = MagicMock(side_effect = getMetadataEntrySideEffect) + result.findContainersMetadata = MagicMock(return_value = [{"name": "Variant One"}]) + return result + + +def test_variantNodeInit(container_registry, machine_node): + with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = VariantNode("variant_1", machine_node) + + assert "material_1" in node.materials + assert "material_2" in node.materials + assert len(node.materials) == 2 + + +def test_variantNodeInit_excludedMaterial(container_registry, machine_node): + machine_node.exclude_materials = ["material_1"] + with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = VariantNode("variant_1", machine_node) + + assert "material_1" not in node.materials + assert "material_2" in node.materials + assert len(node.materials) == 1 From 476c7b683df681bcd3e87b5842e7795e51e7c3f9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 17:23:12 +0200 Subject: [PATCH 104/994] Extend variant node test to also test the material added case CURA-6600 --- tests/Machines/TestVariantNode.py | 56 ++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 7c0d7c901d..88683f10ba 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -4,18 +4,34 @@ import pytest from cura.Machines.VariantNode import VariantNode -metadata_dict = {"fdmprinter": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}, +instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}, "machine_1": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}], "Variant One": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}} +material_node_added_test_data = [({"type": "Not a material"}, ["material_1", "material_2"]), # Wrong type + ({"type": "material", "base_file": "material_3"}, ["material_1", "material_2"]), # material_3 is on the "NOPE" list. + ({"type": "material", "base_file": "material_4", "definition": "machine_3"}, ["material_1", "material_2"]), # Wrong machine + ({"type": "material", "base_file": "material_4", "definition": "machine_1"}, ["material_1", "material_2"]), # No variant + ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant": "Variant Three"}, ["material_1", "material_2"]), # Wrong variant + ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant": "Variant One"}, ["material_1", "material_2", "material_4"]) + ] + + +metadata_dict = {} + + def getMetadataEntrySideEffect(*args, **kwargs): + return metadata_dict.get(args[0]) + + +def getInstanceContainerSideEffect(*args, **kwargs): variant = kwargs.get("variant") definition = kwargs.get("definition") if variant is not None: - return metadata_dict.get(definition).get(variant) - return metadata_dict.get(definition).get("no_variant") + return instance_container_metadata_dict.get(definition).get(variant) + return instance_container_metadata_dict.get(definition).get("no_variant") @pytest.fixture @@ -28,15 +44,25 @@ def machine_node(): @pytest.fixture def container_registry(): result = MagicMock() - result.findInstanceContainersMetadata = MagicMock(side_effect = getMetadataEntrySideEffect) + result.findInstanceContainersMetadata = MagicMock(side_effect = getInstanceContainerSideEffect) result.findContainersMetadata = MagicMock(return_value = [{"name": "Variant One"}]) return result -def test_variantNodeInit(container_registry, machine_node): +def createMockedInstanceContainer(): + result = MagicMock() + result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) + return result + + +def createVariantNode(container_id, machine_node, container_registry): with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - node = VariantNode("variant_1", machine_node) + return VariantNode(container_id, machine_node) + + +def test_variantNodeInit(container_registry, machine_node): + node = createVariantNode("variant_1", machine_node, container_registry) assert "material_1" in node.materials assert "material_2" in node.materials @@ -45,10 +71,22 @@ def test_variantNodeInit(container_registry, machine_node): def test_variantNodeInit_excludedMaterial(container_registry, machine_node): machine_node.exclude_materials = ["material_1"] - with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - node = VariantNode("variant_1", machine_node) + node = createVariantNode("variant_1", machine_node, container_registry) assert "material_1" not in node.materials assert "material_2" in node.materials assert len(node.materials) == 1 + + +@pytest.mark.parametrize("metadata,material_result_list", material_node_added_test_data) +def test_materialAdded(container_registry, machine_node, metadata, material_result_list): + variant_node = createVariantNode("machine_1", machine_node, container_registry) + machine_node.exclude_materials = ["material_3"] + with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. + with patch.dict(metadata_dict, metadata): + mocked_container = createMockedInstanceContainer() + variant_node._materialAdded(mocked_container) + + assert len(material_result_list) == len(variant_node.materials) + for name in material_result_list: + assert name in variant_node.materials \ No newline at end of file From a8fbb80b09650d4e7d11bfb45583c71f762ca511 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 8 Aug 2019 10:46:24 +0200 Subject: [PATCH 105/994] Add tests for the updating of MaterialNodes in the variant node CURA-6600 --- tests/Machines/TestVariantNode.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 88683f10ba..9d4d63b392 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -2,7 +2,7 @@ from unittest.mock import patch, MagicMock import pytest from cura.Machines.VariantNode import VariantNode - +import copy instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}]}, "machine_1": {"no_variant": [{"base_file": "material_1", "id": "material_1"}, {"base_file": "material_2", "id": "material_2"}], @@ -17,6 +17,10 @@ material_node_added_test_data = [({"type": "Not a material"}, ["material_1", "ma ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant": "Variant One"}, ["material_1", "material_2", "material_4"]) ] +material_node_update_test_data = [({"type": "material", "base_file": "material_1", "definition": "machine_1", "variant": "Variant One"}, ["material_1"], ["material_2"]), + ({"type": "material", "base_file": "material_1", "definition": "fdmprinter", "variant": "Variant One"}, [], ["material_2", "material_1"]), # Too generic + ({"type": "material", "base_file": "material_1", "definition": "machine_2", "variant": "Variant One"}, [], ["material_2", "material_1"]) # Wrong definition + ] metadata_dict = {} @@ -89,4 +93,22 @@ def test_materialAdded(container_registry, machine_node, metadata, material_resu assert len(material_result_list) == len(variant_node.materials) for name in material_result_list: - assert name in variant_node.materials \ No newline at end of file + assert name in variant_node.materials + +@pytest.mark.parametrize("metadata,changed_material_list,unchanged_material_list", material_node_update_test_data) +def test_materialAdded_update(container_registry, machine_node, metadata,changed_material_list, unchanged_material_list): + variant_node = createVariantNode("machine_1", machine_node, container_registry) + original_material_nodes = copy.copy(variant_node.materials) + + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. + with patch.dict(metadata_dict, metadata): + mocked_container = createMockedInstanceContainer() + variant_node._materialAdded(mocked_container) + + for key in unchanged_material_list: + assert original_material_nodes[key] == variant_node.materials[key] + + for key in changed_material_list: + assert original_material_nodes[key] != variant_node.materials[key] + From 4934d7a6e9d13de78fc20f0fa0376de2dfcfd784 Mon Sep 17 00:00:00 2001 From: Mathias Lyngklip Kjeldgaard Date: Thu, 8 Aug 2019 11:03:24 +0200 Subject: [PATCH 106/994] Fixed a bug caused by ":" I discovered the ":" I added caused the rest of the message to not be displayed when printing from a SD card, so I removed the ":". --- .../PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py index e5f61f7360..9152ab65f9 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py @@ -61,7 +61,7 @@ class DisplayRemainingTimeOnLCD(Script): m, s = divmod(total_time, 60) # Math to calculate h, m = divmod(m, 60) # hours, minutes and seconds. total_time_string = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string - lines[line_index] = "M117 Time Left: {}".format(total_time_string) # And print that string instead of the original one + lines[line_index] = "M117 Time Left {}".format(total_time_string) # And print that string instead of the original one @@ -83,7 +83,7 @@ class DisplayRemainingTimeOnLCD(Script): m1, s1 = divmod(time_left, 60) # And some math to get the total time in seconds into h1, m1 = divmod(m1, 60) # the right format. (HH,MM,SS) current_time_string = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time - lines[line_index] = "M117 Time Left: {}".format(current_time_string) # And now insert that into the GCODE + lines[line_index] = "M117 Time Left {}".format(current_time_string) # And now insert that into the GCODE # Here we are OUT of the second for-loop From c26d1130023c59bd33e11bb84ceb898018e4ff08 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 8 Aug 2019 13:52:45 +0200 Subject: [PATCH 107/994] Add test for the MaterialNode CURA-6600 --- tests/Machines/TestMaterialNode.py | 121 +++++++++++++++++++++++++++++ tests/Machines/TestVariantNode.py | 3 +- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 tests/Machines/TestMaterialNode.py diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py new file mode 100644 index 0000000000..44a1e7850f --- /dev/null +++ b/tests/Machines/TestMaterialNode.py @@ -0,0 +1,121 @@ +from unittest.mock import patch, MagicMock +import pytest + +from cura.Machines.MaterialNode import MaterialNode + +instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"id": "quality_1"}]}, + "machine_1": {"variant_1": {"material_1": [{"id": "quality_2"}, {"id": "quality_3"}]}}} + + +quality_metadata_machine_quality_test_data = [({"type": "Not a quality"}, ["quality_2", "quality_3"]), # Wrong type + ({"type": "quality", "definition": "machine_2"}, ["quality_2", "quality_3"]), # Wrong defintion + ({"type": "quality", "definition": "machine_1", "variant": "variant_2"}, ["quality_2", "quality_3"]), # Wrong variant + ({"type": "quality", "definition": "machine_1", "variant": "variant_1", "material": "material_2"}, ["quality_2", "quality_3"]), # wrong material + ({"type": "quality", "definition": "machine_1", "variant": "variant_1", "material": "material_1"}, ["quality_2", "quality_3", "quality_4"]), + ] + +quality_metadata_no_machine_quality =[({"type": "Not a quality"}, ["quality_1"]), # Wrong type + ({"type": "quality", "definition": "machine_1"}, ["quality_1"]), # Wrong defintion (it needs fdmprinter) + ({"type": "quality", "definition": "fdmprinter", "variant": "variant_2"}, ["quality_1", "quality_4"]), # Wrong variant, but should be added (as we ignore the variant) + ({"type": "quality", "definition": "fdmprinter", "variant": "variant_1", "material": "material_2"}, ["quality_1", "quality_4"]), # wrong material, but should be added (as we ignore the material) + ({"type": "quality", "definition": "fdmprinter", "variant": "variant_1", "material": "material_1"}, ["quality_1", "quality_4"]), + ] + +metadata_dict = {} + + +def getMetadataEntrySideEffect(*args, **kwargs): + return metadata_dict.get(args[0]) + +def createMockedInstanceContainer(container_id): + result = MagicMock() + result.getId = MagicMock(return_value=container_id) + result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) + return result + + +def getInstanceContainerSideEffect(*args, **kwargs): + variant = kwargs.get("variant") + definition = kwargs.get("definition") + if variant is not None: + definition_dict = instance_container_metadata_dict.get(definition) + variant_dict = definition_dict.get(variant) + material_dict = variant_dict.get(kwargs.get("material")) + return material_dict + return instance_container_metadata_dict.get(definition).get("no_variant") + + +@pytest.fixture +def container_registry(): + result = MagicMock() + result.findInstanceContainersMetadata = MagicMock(side_effect=getInstanceContainerSideEffect) + result.findContainersMetadata = MagicMock(return_value = [{"base_file": "material_1"}]) + return result + + +def test_materialNodeInit_noMachineQuality(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = False + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + assert len(node.qualities) == 1 + assert "quality_1" in node.qualities + + +def test_materialNodeInit_MachineQuality(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + assert len(node.qualities) == 2 + assert "quality_2" in node.qualities + assert "quality_3" in node.qualities + + +@pytest.mark.parametrize("metadata,qualities_result_list", quality_metadata_machine_quality_test_data) +def test_qualityAdded_hasMachineQuality(container_registry, metadata, qualities_result_list): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + + container = createMockedInstanceContainer("quality_4") + + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + with patch.dict(metadata_dict, metadata): + node._qualityAdded(container) + + assert len(qualities_result_list) == len(node.qualities) + for name in qualities_result_list: + assert name in node.qualities + + + +@pytest.mark.parametrize("metadata,qualities_result_list", quality_metadata_no_machine_quality) +def test_qualityAdded_noMachineQuality(container_registry, metadata, qualities_result_list): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = False + + container = createMockedInstanceContainer("quality_4") + + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + with patch.dict(metadata_dict, metadata): + node._qualityAdded(container) + + assert len(qualities_result_list) == len(node.qualities) + for name in qualities_result_list: + assert name in node.qualities \ No newline at end of file diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 9d4d63b392..e04c369762 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -95,8 +95,9 @@ def test_materialAdded(container_registry, machine_node, metadata, material_resu for name in material_result_list: assert name in variant_node.materials + @pytest.mark.parametrize("metadata,changed_material_list,unchanged_material_list", material_node_update_test_data) -def test_materialAdded_update(container_registry, machine_node, metadata,changed_material_list, unchanged_material_list): +def test_materialAdded_update(container_registry, machine_node, metadata, changed_material_list, unchanged_material_list): variant_node = createVariantNode("machine_1", machine_node, container_registry) original_material_nodes = copy.copy(variant_node.materials) From e2596e64ef60441371c6ab3bb4fa1315c5499b7c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 8 Aug 2019 14:11:00 +0200 Subject: [PATCH 108/994] Add tests for quality node --- tests/Machines/TestMaterialNode.py | 2 +- tests/Machines/TestQualityNode.py | 78 ++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/Machines/TestQualityNode.py diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index 44a1e7850f..e288a5310d 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -27,6 +27,7 @@ metadata_dict = {} def getMetadataEntrySideEffect(*args, **kwargs): return metadata_dict.get(args[0]) + def createMockedInstanceContainer(container_id): result = MagicMock() result.getId = MagicMock(return_value=container_id) @@ -100,7 +101,6 @@ def test_qualityAdded_hasMachineQuality(container_registry, metadata, qualities_ assert name in node.qualities - @pytest.mark.parametrize("metadata,qualities_result_list", quality_metadata_no_machine_quality) def test_qualityAdded_noMachineQuality(container_registry, metadata, qualities_result_list): variant_node = MagicMock() diff --git a/tests/Machines/TestQualityNode.py b/tests/Machines/TestQualityNode.py new file mode 100644 index 0000000000..cad30d642c --- /dev/null +++ b/tests/Machines/TestQualityNode.py @@ -0,0 +1,78 @@ +from unittest.mock import patch, MagicMock +import pytest + +from cura.Machines.MaterialNode import MaterialNode +from cura.Machines.QualityNode import QualityNode + + +instance_container_metadata_dict = {"fdmprinter": {"variant_1": {"material_1": [{"id": "intent_1"}, {"id": "intent_2"}]}}, + "machine_1": {"variant_2": {"material_2": [{"id": "intent_3"}, {"id": "intent_4"}]}}} + + +intent_metadata_intent_added_data = [({"type": "Not an intent"}, ["intent_3", "intent_4"]), # Wrong type + ({"type": "intent", "definition": "machine_9000"}, ["intent_3", "intent_4"]), # wrong definition + ({"type": "intent", "definition": "machine_1", "variant": "variant_299101"}, ["intent_3", "intent_4"]), # wrong variant + ({"type": "intent", "definition": "machine_1", "variant": "variant_2", "material": "super cool material!"}, ["intent_3", "intent_4"]), # Wrong material + ({"type": "intent", "definition": "machine_1", "variant": "variant_2", "material": "material_2"}, ["intent_3", "intent_4", "intent_9001"]), # Yay, all good. +] + +metadata_dict = {} + + +def getMetadataEntrySideEffect(*args, **kwargs): + return metadata_dict.get(args[0]) + + +def createMockedInstanceContainer(container_id): + result = MagicMock() + result.getId = MagicMock(return_value=container_id) + result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) + return result + + +def getInstanceContainerSideEffect(*args, **kwargs): + + definition_dict = instance_container_metadata_dict.get(kwargs["definition"]) + variant_dict = definition_dict.get(kwargs["variant"]) + return variant_dict.get(kwargs["material"]) + +@pytest.fixture +def container_registry(): + result = MagicMock() + result.findInstanceContainersMetadata = MagicMock(side_effect=getInstanceContainerSideEffect) + return result + + +def test_qualityNode_machine_1(container_registry): + material_node = MagicMock() + material_node.variant.machine.quality_definition = "machine_1" + material_node.variant.variant_name = "variant_2" + material_node.base_file = "material_2" + + with patch("cura.Machines.QualityNode.IntentNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = QualityNode("quality_1", material_node) + + assert len(node.intents) == 2 + assert "intent_3" in node.intents + assert "intent_4" in node.intents + +@pytest.mark.parametrize("metadata,intent_result_list", intent_metadata_intent_added_data) +def test_intentNodeAdded(container_registry, metadata, intent_result_list): + material_node = MagicMock() + material_node.variant.machine.quality_definition = "machine_1" + material_node.variant.variant_name = "variant_2" + material_node.base_file = "material_2" + + intent_container = createMockedInstanceContainer("intent_9001") + + with patch("cura.Machines.QualityNode.IntentNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = QualityNode("quality_1", material_node) + with patch.dict(metadata_dict, metadata): + node._intentAdded(intent_container) + + assert len(intent_result_list) == len(node.intents) + for identifier in intent_result_list: + assert identifier in node.intents + From f31d7798cecf6bbb953d7340ab5d66ca3fd374ac Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 8 Aug 2019 16:26:38 +0200 Subject: [PATCH 109/994] Add warning for adding local copies of metadata Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 1a2369ecd2..114be73338 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -21,6 +21,9 @@ class MachineNode(ContainerNode): self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + # Some of the metadata is cached upon construction here. + # ONLY DO THAT FOR METADATA THAT DOESN'T CHANGE DURING RUNTIME! + # Otherwise you need to keep it up-to-date during runtime. self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) self.quality_definition = my_metadata.get("quality_definition", container_id) From 65360c31efa3ad400486b5682281d72cdbcbdc42 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 8 Aug 2019 17:04:53 +0200 Subject: [PATCH 110/994] Let Quality/Material/Variant Managers be a proper singleton Rather than a singleton contained within the CuraApplication class. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 34 ++++----------- cura/Machines/MaterialManager.py | 73 ++++++++++++++++++-------------- cura/Machines/QualityManager.py | 37 ++++++++++------ cura/Machines/VariantManager.py | 20 ++++++--- 4 files changed, 88 insertions(+), 76 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 953336fc30..23ae2f8796 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -15,7 +15,7 @@ from PyQt5.QtQml import qmlRegisterUncreatableType, qmlRegisterSingletonType, qm from UM.i18n import i18nCatalog from UM.Application import Application -from UM.Decorators import override +from UM.Decorators import override, deprecated from UM.FlameProfiler import pyqtSlot from UM.Logger import Logger from UM.Message import Message @@ -23,7 +23,6 @@ from UM.Platform import Platform from UM.PluginError import PluginNotFoundError from UM.Resources import Resources from UM.Preferences import Preferences -from UM.Qt.Bindings import MainWindow from UM.Qt.QtApplication import QtApplication # The class we're inheriting from. import UM.Util from UM.View.SelectionPass import SelectionPass # For typing. @@ -47,7 +46,6 @@ from UM.Scene.Selection import Selection from UM.Scene.ToolHandle import ToolHandle from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Settings.ContainerStack import ContainerStack from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyType from UM.Settings.SettingFunction import SettingFunction @@ -73,6 +71,8 @@ from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator from cura.Scene import ZOffsetDecorator from cura.Machines.MachineErrorChecker import MachineErrorChecker +import cura.Machines.MaterialManager #Imported like this to prevent circular imports. +import cura.Machines.QualityManager #Imported like this to prevent circular imports. from cura.Machines.VariantManager import VariantManager from cura.Machines.Models.BuildPlateModel import BuildPlateModel @@ -136,8 +136,6 @@ from cura import ApplicationMetadata, UltimakerCloudAuthentication from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: - from cura.Machines.MaterialManager import MaterialManager - from cura.Machines.QualityManager import QualityManager from UM.Settings.EmptyInstanceContainer import EmptyInstanceContainer numpy.seterr(all = "ignore") @@ -205,9 +203,7 @@ class CuraApplication(QtApplication): self.empty_quality_container = None # type: EmptyInstanceContainer self.empty_quality_changes_container = None # type: EmptyInstanceContainer - self._variant_manager = None self._material_manager = None - self._quality_manager = None self._machine_manager = None self._extruder_manager = None self._container_manager = None @@ -734,21 +730,6 @@ class CuraApplication(QtApplication): def run(self): super().run() - container_registry = self._container_registry - - Logger.log("i", "Initializing variant manager") - self._variant_manager = VariantManager(container_registry) - self._variant_manager.initialize() - - Logger.log("i", "Initializing material manager") - from cura.Machines.MaterialManager import MaterialManager - self._material_manager = MaterialManager(container_registry, parent = self) - self._material_manager.initialize() - - Logger.log("i", "Initializing quality manager") - from cura.Machines.QualityManager import QualityManager - self._quality_manager = QualityManager(self, parent = self) - self._quality_manager.initialize() Logger.log("i", "Initializing machine manager") self._machine_manager = MachineManager(self, parent = self) @@ -928,16 +909,19 @@ class CuraApplication(QtApplication): self._extruder_manager = ExtruderManager() return self._extruder_manager + @deprecated("Use the ContainerTree structure instead.", since = "4.3") def getVariantManager(self, *args) -> VariantManager: - return self._variant_manager + return VariantManager.getInstance() + # Can't deprecate this function since the deprecation marker collides with pyqtSlot! @pyqtSlot(result = QObject) def getMaterialManager(self, *args) -> "MaterialManager": - return self._material_manager + return cura.Machines.MaterialManager.MaterialManager.getInstance() + # Can't deprecate this function since the deprecation marker collides with pyqtSlot! @pyqtSlot(result = QObject) def getQualityManager(self, *args) -> "QualityManager": - return self._quality_manager + return cura.Machines.QualityManager.QualityManager.getInstance() def getIntentManager(self, *args) -> IntentManager: return IntentManager.getInstance() diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 2163cde623..c2b3f00210 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from collections import defaultdict, OrderedDict @@ -8,12 +8,13 @@ from typing import Dict, Optional, TYPE_CHECKING, Any, Set, List, cast, Tuple from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot -from UM.Application import Application from UM.ConfigurationErrorMessage import ConfigurationErrorMessage +from UM.Decorators import deprecated from UM.Logger import Logger -from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.SettingFunction import SettingFunction from UM.Util import parseBool +import cura.CuraApplication #Imported like this to prevent circular imports. +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from .MaterialNode import MaterialNode from .MaterialGroup import MaterialGroup @@ -37,15 +38,20 @@ if TYPE_CHECKING: # because it's simple. # class MaterialManager(QObject): + __instance = None + + @classmethod + @deprecated("Use the ContainerTree structure instead.", since = "4.3") + def getInstance(cls) -> "MaterialManager": + if cls.__instance is None: + cls.__instance = MaterialManager() + return cls.__instance materialsUpdated = pyqtSignal() # Emitted whenever the material lookup tables are updated. favoritesUpdated = pyqtSignal() # Emitted whenever the favorites are changed - def __init__(self, container_registry, parent = None): + def __init__(self, parent = None): super().__init__(parent) - self._application = Application.getInstance() - self._container_registry = container_registry # type: ContainerRegistry - # Material_type -> generic material metadata self._fallback_materials_map = dict() # type: Dict[str, Dict[str, Any]] @@ -81,16 +87,18 @@ class MaterialManager(QObject): self._update_timer.setSingleShot(True) self._update_timer.timeout.connect(self._updateMaps) - self._container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) - self._container_registry.containerAdded.connect(self._onContainerMetadataChanged) - self._container_registry.containerRemoved.connect(self._onContainerMetadataChanged) + container_registry = CuraContainerRegistry.getInstance() + container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) + container_registry.containerAdded.connect(self._onContainerMetadataChanged) + container_registry.containerRemoved.connect(self._onContainerMetadataChanged) self._favorites = set() # type: Set[str] def initialize(self) -> None: # Find all materials and put them in a matrix for quick search. + container_registry = CuraContainerRegistry.getInstance() material_metadatas = {metadata["id"]: metadata for metadata in - self._container_registry.findContainersMetadata(type = "material") if + container_registry.findContainersMetadata(type = "material") if metadata.get("GUID")} # type: Dict[str, Dict[str, Any]] self._material_group_map = dict() # type: Dict[str, MaterialGroup] @@ -107,7 +115,7 @@ class MaterialManager(QObject): continue if root_material_id not in self._material_group_map: self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id])) - self._material_group_map[root_material_id].is_read_only = self._container_registry.isReadOnly(root_material_id) + self._material_group_map[root_material_id].is_read_only = container_registry.isReadOnly(root_material_id) group = self._material_group_map[root_material_id] # Store this material in the group of the appropriate root material. @@ -206,7 +214,7 @@ class MaterialManager(QObject): for material_metadata in material_metadatas.values(): self.__addMaterialMetadataIntoLookupTree(material_metadata) - favorites = self._application.getPreferences().getValue("cura/favorite_materials") + favorites = cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials") for item in favorites.split(";"): self._favorites.add(item) @@ -239,7 +247,7 @@ class MaterialManager(QObject): (buildplate_name, VariantType.BUILD_PLATE), ] - variant_manager = self._application.getVariantManager() + variant_manager = cura.CuraApplication.CuraApplication.getInstance().getVariantManager() machine_node = machine_nozzle_buildplate_material_map[definition] current_node = machine_node @@ -264,7 +272,7 @@ class MaterialManager(QObject): if error_message is not None: Logger.log("e", "%s It will not be added into the material lookup tree.", error_message) - self._container_registry.addWrongContainerId(material_metadata["id"]) + CuraContainerRegistry.getInstance().addWrongContainerId(material_metadata["id"]) return # Add the material to the current tree node, which is the deepest (the most specific) branch we can find. @@ -537,6 +545,7 @@ class MaterialManager(QObject): Logger.log("i", "Unable to remove the material with id %s, because it doesn't exist.", root_material_id) return + container_registry = CuraContainerRegistry.getInstance() nodes_to_remove = [material_group.root_material_node] + material_group.derived_material_node_list # Sort all nodes with respect to the container ID lengths in the ascending order so the base material container # will be the first one to be removed. We need to do this to ensure that all containers get loaded & deleted. @@ -545,11 +554,11 @@ class MaterialManager(QObject): # list, so removeContainer() can ignore those ones. for node in nodes_to_remove: container_id = node.getMetaDataEntry("id", "") - results = self._container_registry.findContainers(id = container_id) + results = container_registry.findContainers(id = container_id) if not results: - self._container_registry.addWrongContainerId(container_id) + container_registry.addWrongContainerId(container_id) for node in nodes_to_remove: - self._container_registry.removeContainer(node.getMetaDataEntry("id", "")) + container_registry.removeContainer(node.getMetaDataEntry("id", "")) # # Methods for GUI @@ -567,7 +576,7 @@ class MaterialManager(QObject): nodes_to_remove = [material_group.root_material_node] + material_group.derived_material_node_list ids_to_remove = [node.getMetaDataEntry("id", "") for node in nodes_to_remove] - for extruder_stack in self._container_registry.findContainerStacks(type="extruder_train"): + for extruder_stack in CuraContainerRegistry.getInstance().findContainerStacks(type = "extruder_train"): if extruder_stack.material.getId() in ids_to_remove: return False return True @@ -577,7 +586,7 @@ class MaterialManager(QObject): root_material_id = material_node.getMetaDataEntry("base_file") if root_material_id is None: return - if self._container_registry.isReadOnly(root_material_id): + if CuraContainerRegistry.getInstance().isReadOnly(root_material_id): Logger.log("w", "Cannot set name of read-only container %s.", root_material_id) return @@ -614,12 +623,13 @@ class MaterialManager(QObject): return None # Ensure all settings are saved. - self._application.saveSettings() + cura.CuraApplication.CuraApplication.getInstance().saveSettings() # Create a new ID & container to hold the data. new_containers = [] + container_registry = CuraContainerRegistry.getInstance() if new_base_id is None: - new_base_id = self._container_registry.uniqueName(base_container.getId()) + new_base_id = container_registry.uniqueName(base_container.getId()) new_base_container = copy.deepcopy(base_container) new_base_container.getMetaData()["id"] = new_base_id new_base_container.getMetaData()["base_file"] = new_base_id @@ -652,7 +662,7 @@ class MaterialManager(QObject): for container_to_add in new_containers: container_to_add.setDirty(True) - self._container_registry.addContainer(container_to_add) + container_registry.addContainer(container_to_add) # if the duplicated material was favorite then the new material should also be added to favorite. if root_material_id in self.getFavorites(): @@ -668,12 +678,13 @@ class MaterialManager(QObject): from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") # Ensure all settings are saved. - self._application.saveSettings() + application = cura.CuraApplication.CuraApplication.getInstance() + application.saveSettings() - machine_manager = self._application.getMachineManager() + machine_manager = application.getMachineManager() extruder_stack = machine_manager.activeStack - machine_definition = self._application.getGlobalContainerStack().definition + machine_definition = application.getGlobalContainerStack().definition root_material_id = machine_definition.getMetaDataEntry("preferred_material", default = "generic_pla") approximate_diameter = str(extruder_stack.approximateMaterialDiameter) @@ -685,7 +696,7 @@ class MaterialManager(QObject): return "" # Create a new ID & container to hold the data. - new_id = self._container_registry.uniqueName("custom_material") + new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material") new_metadata = {"name": catalog.i18nc("@label", "Custom Material"), "brand": catalog.i18nc("@label", "Custom"), "GUID": str(uuid.uuid4()), @@ -702,8 +713,8 @@ class MaterialManager(QObject): self.materialsUpdated.emit() # Ensure all settings are saved. - self._application.getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) - self._application.saveSettings() + cura.CuraApplication.CuraApplication.getInstance().getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) + cura.CuraApplication.CuraApplication.getInstance().saveSettings() @pyqtSlot(str) def removeFavorite(self, root_material_id: str) -> None: @@ -715,8 +726,8 @@ class MaterialManager(QObject): self.materialsUpdated.emit() # Ensure all settings are saved. - self._application.getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) - self._application.saveSettings() + cura.CuraApplication.CuraApplication.getInstance().getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) + cura.CuraApplication.CuraApplication.getInstance().saveSettings() @pyqtSlot() def getFavorites(self): diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index a4386dde74..d90a20e10b 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import TYPE_CHECKING, Optional, cast, Dict, List, Set @@ -9,10 +9,11 @@ from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.InstanceContainer import InstanceContainer +from UM.Decorators import deprecated +import cura.CuraApplication from cura.Settings.ExtruderStack import ExtruderStack -from cura.Machines.ContainerTree import ContainerTree from .QualityGroup import QualityGroup from .QualityNode import QualityNode @@ -20,7 +21,6 @@ if TYPE_CHECKING: from UM.Settings.Interfaces import DefinitionContainerInterface from cura.Settings.GlobalStack import GlobalStack from .QualityChangesGroup import QualityChangesGroup - from cura.CuraApplication import CuraApplication # @@ -34,17 +34,25 @@ if TYPE_CHECKING: # because it's simple. # class QualityManager(QObject): + __instance = None + + @classmethod + @deprecated("Use the ContainerTree structure instead.", since = "4.3") + def getInstance(cls) -> "QualityManager": + if cls.__instance is None: + cls.__instance = QualityManager() + return cls.__instance qualitiesUpdated = pyqtSignal() - def __init__(self, application: "CuraApplication", parent = None) -> None: + def __init__(self, parent = None) -> None: super().__init__(parent) - self._application = application - self._material_manager = self._application.getMaterialManager() - self._container_registry = self._application.getContainerRegistry() + application = cura.CuraApplication.CuraApplication.getInstance() + self._material_manager = application.getMaterialManager() + self._container_registry = application.getContainerRegistry() - self._empty_quality_container = self._application.empty_quality_container - self._empty_quality_changes_container = self._application.empty_quality_changes_container + self._empty_quality_container = application.empty_quality_container + self._empty_quality_changes_container = application.empty_quality_changes_container # For quality lookup self._machine_nozzle_buildplate_material_quality_type_to_quality_dict = {} # type: Dict[str, QualityNode] @@ -422,8 +430,9 @@ class QualityManager(QObject): quality_changes_group.name = new_name - self._application.getMachineManager().activeQualityChanged.emit() - self._application.getMachineManager().activeQualityGroupChanged.emit() + application = cura.CuraApplication.CuraApplication.getInstance() + application.getMachineManager().activeQualityChanged.emit() + application.getMachineManager().activeQualityGroupChanged.emit() return new_name @@ -432,7 +441,7 @@ class QualityManager(QObject): # @pyqtSlot(str, "QVariantMap") def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item) -> None: - global_stack = self._application.getGlobalContainerStack() + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack: Logger.log("i", "No active global stack, cannot duplicate quality changes.") return @@ -461,7 +470,7 @@ class QualityManager(QObject): # stack and clear the user settings. @pyqtSlot(str) def createQualityChanges(self, base_name: str) -> None: - machine_manager = self._application.getMachineManager() + machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() global_stack = machine_manager.activeMachine if not global_stack: @@ -522,7 +531,7 @@ class QualityManager(QObject): machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) quality_changes.setDefinition(machine_definition_id) - quality_changes.setMetaDataEntry("setting_version", self._application.SettingVersion) + quality_changes.setMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.getInstance().SettingVersion) return quality_changes diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index eaaa9fc5f0..67853bb9c7 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -1,16 +1,17 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from collections import OrderedDict from typing import Optional, TYPE_CHECKING, Dict from UM.ConfigurationErrorMessage import ConfigurationErrorMessage +from UM.Decorators import deprecated from UM.Logger import Logger -from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Util import parseBool from cura.Machines.ContainerNode import ContainerNode from cura.Machines.VariantType import VariantType, ALL_VARIANT_TYPES +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: @@ -35,10 +36,16 @@ if TYPE_CHECKING: # A container is loaded when getVariant() is called to load a variant InstanceContainer. # class VariantManager: + __instance = None - def __init__(self, container_registry: ContainerRegistry) -> None: - self._container_registry = container_registry + @classmethod + @deprecated("Use the ContainerTree structure instead.", since = "4.3") + def getInstance(cls) -> "VariantManager": + if cls.__instance is None: + cls.__instance = VariantManager() + return cls.__instance + def __init__(self) -> None: self._machine_to_variant_dict_map = dict() # type: Dict[str, Dict["VariantType", Dict[str, ContainerNode]]] self._machine_to_buildplate_dict_map = dict() # type: Dict[str, Dict[str, ContainerNode]] @@ -53,7 +60,8 @@ class VariantManager: self._machine_to_buildplate_dict_map = OrderedDict() # Cache all variants from the container registry to a variant map for better searching and organization. - variant_metadata_list = self._container_registry.findContainersMetadata(type = "variant") + container_registry = CuraContainerRegistry.getInstance + variant_metadata_list = container_registry.findContainersMetadata(type = "variant") for variant_metadata in variant_metadata_list: if variant_metadata["id"] in self._exclude_variant_id_list: Logger.log("d", "Exclude variant [%s]", variant_metadata["id"]) @@ -85,7 +93,7 @@ class VariantManager: if variant_definition not in self._machine_to_buildplate_dict_map: self._machine_to_buildplate_dict_map[variant_definition] = OrderedDict() - variant_container = self._container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0] + variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0] buildplate_type = variant_container.getProperty("machine_buildplate_type", "value") if buildplate_type not in self._machine_to_buildplate_dict_map[variant_definition]: self._machine_to_variant_dict_map[variant_definition][buildplate_type] = dict() From e10669216571fb33f2fedf304ff5bd284c24a79d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 8 Aug 2019 17:30:24 +0200 Subject: [PATCH 111/994] Make ContainerTree singleton but construct in run() of application We want to make sure that this tree is constructed during start-up after all containers have been registered, so we call getInstance() there once. If you need the tree before that, the tree will not yet have been filled and you won't get complete information, so you'd need to listen for updates. The singleton is there so you don't need to go via CuraApplication. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 4 ++++ cura/Machines/ContainerTree.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 23ae2f8796..e764e10fec 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -70,6 +70,7 @@ from cura.Scene.CuraSceneNode import CuraSceneNode from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator from cura.Scene import ZOffsetDecorator +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MachineErrorChecker import MachineErrorChecker import cura.Machines.MaterialManager #Imported like this to prevent circular imports. import cura.Machines.QualityManager #Imported like this to prevent circular imports. @@ -731,6 +732,9 @@ class CuraApplication(QtApplication): def run(self): super().run() + Logger.log("i", "Building container tree.") + ContainerTree.getInstance() + Logger.log("i", "Initializing machine manager") self._machine_manager = MachineManager(self, parent = self) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 14c54459a3..4aca86c393 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -14,6 +14,14 @@ from typing import Dict # The tree starts at the machine definitions. For every distinct definition # there will be one machine node here. class ContainerTree: + __instance = None + + @classmethod + def getInstance(cls): + if cls.__instance is None: + cls.__instance = ContainerTree() + return cls.__instance + def __init__(self) -> None: self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. container_registry = ContainerRegistry.getInstance() From d710a58233e81c775be62b31203d33ca4fcc307b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 8 Aug 2019 17:31:26 +0200 Subject: [PATCH 112/994] Don't require VariantManager any more from CuraStackBuilder We now use the new container tree structure there. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 3 +++ cura/Settings/CuraStackBuilder.py | 20 ++++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 114be73338..0e424101c0 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -20,6 +20,7 @@ class MachineNode(ContainerNode): super().__init__(container_id) self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] # Some of the metadata is cached upon construction here. # ONLY DO THAT FOR METADATA THAT DOESN'T CHANGE DURING RUNTIME! @@ -28,6 +29,8 @@ class MachineNode(ContainerNode): self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) self.quality_definition = my_metadata.get("quality_definition", container_id) self.exclude_materials = my_metadata.get("exclude_materials", []) + self.preferred_variant_name = my_metadata.get("preferred_variant_name", "") + container_registry.containerAdded.connect(self._variantAdded) self._loadAll() diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index d20e686279..014bd9adb8 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional @@ -8,6 +8,7 @@ from UM.Logger import Logger from UM.Settings.Interfaces import DefinitionContainerInterface from UM.Settings.InstanceContainer import InstanceContainer +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType from .GlobalStack import GlobalStack from .ExtruderStack import ExtruderStack @@ -38,14 +39,6 @@ class CuraStackBuilder: machine_definition = definitions[0] - # get variant container for the global stack - global_variant_container = application.empty_variant_container - global_variant_node = variant_manager.getDefaultVariantNode(machine_definition, VariantType.BUILD_PLATE) - if global_variant_node: - global_variant_container = global_variant_node.getContainer() - if not global_variant_container: - global_variant_container = application.empty_variant_container - generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName()) # Make sure the new name does not collide with any definition or (quality) profile # createUniqueName() only looks at other stacks, but not at definitions or quality profiles @@ -56,7 +49,7 @@ class CuraStackBuilder: new_global_stack = cls.createGlobalStack( new_stack_id = generated_name, definition = machine_definition, - variant_container = global_variant_container, + variant_container = application.empty_variant_container, material_container = application.empty_material_container, quality_container = application.empty_quality_container, ) @@ -108,16 +101,15 @@ class CuraStackBuilder: def createExtruderStackWithDefaultSetup(cls, global_stack: "GlobalStack", extruder_position: int) -> None: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - variant_manager = application.getVariantManager() material_manager = application.getMaterialManager() registry = application.getContainerRegistry() # get variant container for extruders extruder_variant_container = application.empty_variant_container - extruder_variant_node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE, - global_stack = global_stack) + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) extruder_variant_name = None - if extruder_variant_node: + if extruder_variant_node is not None: extruder_variant_container = extruder_variant_node.getContainer() if not extruder_variant_container: extruder_variant_container = application.empty_variant_container From bd714f947a241243813fd71c6f30414c7a3d6f0e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 13:40:11 +0200 Subject: [PATCH 113/994] Register container tree to be built once all metadata is in So if we ever change the order of initialisation this stays working. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 5 ++--- cura/Machines/ContainerTree.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e764e10fec..5af33b82c9 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -511,6 +511,8 @@ class CuraApplication(QtApplication): self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Loading machines...")) + self._container_registry.allMetadataLoaded.connect(ContainerRegistry.getInstance) + with self._container_registry.lockFile(): self._container_registry.loadAllMetadata() @@ -732,9 +734,6 @@ class CuraApplication(QtApplication): def run(self): super().run() - Logger.log("i", "Building container tree.") - ContainerTree.getInstance() - Logger.log("i", "Initializing machine manager") self._machine_manager = MachineManager(self, parent = self) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 4aca86c393..129bcba5e8 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -1,6 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.Interfaces import ContainerInterface @@ -30,6 +31,7 @@ class ContainerTree: ## Builds the initial container tree. def _loadAll(self): + Logger.log("i", "Building container tree.") all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: definition_id = stack.definition.getId() From f65e6728873008f794488148ce111e25704d6faa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 13:43:17 +0200 Subject: [PATCH 114/994] Don't get build plate variants from tree any more It's not in that tree. Contributes to issue CURA-6600. --- cura/Machines/Models/BuildPlateModel.py | 28 +++---------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/cura/Machines/Models/BuildPlateModel.py b/cura/Machines/Models/BuildPlateModel.py index 82b9db4d64..c52228cf76 100644 --- a/cura/Machines/Models/BuildPlateModel.py +++ b/cura/Machines/Models/BuildPlateModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt @@ -21,31 +21,9 @@ class BuildPlateModel(ListModel): self.addRoleName(self.NameRole, "name") self.addRoleName(self.ContainerNodeRole, "container_node") - self._application = Application.getInstance() - self._variant_manager = self._application._variant_manager - self._machine_manager = self._application.getMachineManager() - - self._machine_manager.globalContainerChanged.connect(self._update) - self._update() def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - global_stack = self._machine_manager._global_container_stack - if not global_stack: - self.setItems([]) - return - - has_variants = parseBool(global_stack.getMetaDataEntry("has_variant_buildplates", False)) - if not has_variants: - self.setItems([]) - return - - variant_dict = self._variant_manager.getVariantNodes(global_stack, variant_type = VariantType.BUILD_PLATE) - - item_list = [] - for name, variant_node in variant_dict.items(): - item = {"name": name, - "container_node": variant_node} - item_list.append(item) - self.setItems(item_list) + self.setItems([]) + return \ No newline at end of file From 595b0113b37a5f305a03ef1ca4654f22e07f2238 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 14:25:44 +0200 Subject: [PATCH 115/994] Don't link materialsChanged signal to update in MachineManager The materialsChanged signal only gets called when the favourites are changed, so these updates are all completely unnecessary since they just make sure that the names and such of the materials are up to date. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 764ad8ed43..aec85f9260 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import time @@ -22,7 +22,7 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch +from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel @@ -44,8 +44,6 @@ if TYPE_CHECKING: from cura.Settings.CuraContainerStack import CuraContainerStack from cura.Settings.GlobalStack import GlobalStack from cura.Machines.MaterialManager import MaterialManager - from cura.Machines.QualityManager import QualityManager - from cura.Machines.VariantManager import VariantManager from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityGroup import QualityGroup @@ -119,16 +117,6 @@ class MachineManager(QObject): if containers: containers[0].nameChanged.connect(self._onMaterialNameChanged) - self._material_manager = self._application.getMaterialManager() # type: MaterialManager - self._variant_manager = self._application.getVariantManager() # type: VariantManager - self._quality_manager = self._application.getQualityManager() # type: QualityManager - - # When the materials lookup table gets updated, it can mean that a material has its name changed, which should - # be reflected on the GUI. This signal emission makes sure that it happens. - self._material_manager.materialsUpdated.connect(self.rootMaterialChanged) - # When the materials get updated, it can be that an activated material's diameter gets changed. In that case, - # a material update should be triggered to make sure that the machine still has compatible materials activated. - self._material_manager.materialsUpdated.connect(self._updateUponMaterialMetadataChange) self.rootMaterialChanged.connect(self._onRootMaterialChanged) # Emit the printerConnectedStatusChanged when either globalContainerChanged or outputDevicesChanged are emitted @@ -1199,7 +1187,7 @@ class MachineManager(QObject): # In that case, do not set quality containers to empty. quality_group = None if quality_type != "not_supported": - quality_group_dict = self._quality_manager.getQualityGroups(self._global_container_stack) + quality_group_dict = QualityManager.getInstance().getQualityGroups(self._global_container_stack) quality_group = quality_group_dict.get(quality_type) if quality_group is None: self._fixQualityChangesGroupToNotSupported(quality_changes_group) @@ -1281,7 +1269,7 @@ class MachineManager(QObject): current_quality_type = None if self._current_quality_group: current_quality_type = self._current_quality_group.quality_type - candidate_quality_groups = self._quality_manager.getQualityGroups(self._global_container_stack) + candidate_quality_groups = QualityManager.getInstance().getQualityGroups(self._global_container_stack) available_quality_types = {qt for qt, g in candidate_quality_groups.items() if g.is_available} Logger.log("d", "Current quality type = [%s]", current_quality_type) @@ -1334,7 +1322,7 @@ class MachineManager(QObject): current_nozzle_name = extruder.variant.getMetaDataEntry("name") material_diameter = extruder.getCompatibleMaterialDiameter() - candidate_materials = self._material_manager.getAvailableMaterials( + candidate_materials = MaterialManager.getInstance().getAvailableMaterials( self._global_container_stack.definition, current_nozzle_name, buildplate_name, @@ -1350,7 +1338,7 @@ class MachineManager(QObject): continue # The current material is not available, find the preferred one - material_node = self._material_manager.getDefaultMaterial(self._global_container_stack, position_item, current_nozzle_name) + material_node = MaterialManager.getInstance().getDefaultMaterial(self._global_container_stack, position_item, current_nozzle_name) if material_node is not None: self._setMaterial(position_item, material_node) @@ -1428,7 +1416,7 @@ class MachineManager(QObject): else: variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), extruder_configuration.hotendID) - material_container_node = self._material_manager.getMaterialNodeByType(self._global_container_stack, + material_container_node = MaterialManager.getInstance().getMaterialNodeByType(self._global_container_stack, position, extruder_configuration.hotendID, configuration.buildplateConfiguration, @@ -1498,7 +1486,7 @@ class MachineManager(QObject): extruder_stack = self._global_container_stack.extruders[position] nozzle_name = extruder_stack.variant.getName() material_diameter = extruder_stack.getApproximateMaterialDiameter() - material_node = self._material_manager.getMaterialNode(machine_definition_id, nozzle_name, buildplate_name, + material_node = MaterialManager.getInstance().getMaterialNode(machine_definition_id, nozzle_name, buildplate_name, material_diameter, root_material_id) self.setMaterial(position, material_node) @@ -1545,7 +1533,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return # Get all the quality groups for this global stack and filter out by quality_type - quality_group_dict = self._quality_manager.getQualityGroups(self._global_container_stack) + quality_group_dict = QualityManager.getInstance().getQualityGroups(self._global_container_stack) quality_group = quality_group_dict[quality_type] self.setQualityGroup(quality_group) From 9ed4713cde95edf01d865ade5d9bb51aa90f0adc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 14:34:45 +0200 Subject: [PATCH 116/994] Don't cache singletons in fields This makes it harder to test these things and harder to make it perform well with lazy initialisation. Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 61 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 2422fa3b21..cc3a59ddb3 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os @@ -52,17 +52,11 @@ class ContainerManager(QObject): except TypeError: super().__init__() - self._application = application # type: CuraApplication - self._plugin_registry = self._application.getPluginRegistry() # type: PluginRegistry - self._container_registry = self._application.getContainerRegistry() # type: CuraContainerRegistry - self._machine_manager = self._application.getMachineManager() # type: MachineManager - self._material_manager = self._application.getMaterialManager() # type: MaterialManager - self._quality_manager = self._application.getQualityManager() # type: QualityManager self._container_name_filters = {} # type: Dict[str, Dict[str, Any]] @pyqtSlot(str, str, result=str) def getContainerMetaDataEntry(self, container_id: str, entry_names: str) -> str: - metadatas = self._container_registry.findContainersMetadata(id = container_id) + metadatas = CuraApplication.getInstance().getContainerRegistry().findContainersMetadata(id = container_id) if not metadatas: Logger.log("w", "Could not get metadata of container %s because it was not found.", container_id) return "" @@ -92,11 +86,11 @@ class ContainerManager(QObject): @pyqtSlot("QVariant", str, str) def setContainerMetaDataEntry(self, container_node: "ContainerNode", entry_name: str, entry_value: str) -> bool: root_material_id = container_node.getMetaDataEntry("base_file", "") - if self._container_registry.isReadOnly(root_material_id): + if CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) return False - material_group = self._material_manager.getMaterialGroup(root_material_id) + material_group = MaterialManager.getInstance().getMaterialGroup(root_material_id) if material_group is None: Logger.log("w", "Unable to find material group for: %s.", root_material_id) return False @@ -129,7 +123,7 @@ class ContainerManager(QObject): @pyqtSlot(str, result = str) def makeUniqueName(self, original_name: str) -> str: - return self._container_registry.uniqueName(original_name) + return CuraApplication.getInstance().getContainerRegistry().uniqueName(original_name) ## Get a list of string that can be used as name filters for a Qt File Dialog # @@ -184,7 +178,7 @@ class ContainerManager(QObject): else: mime_type = self._container_name_filters[file_type]["mime"] - containers = self._container_registry.findContainers(id = container_id) + containers = CuraApplication.getInstance().getContainerRegistry().findContainers(id = container_id) if not containers: return {"status": "error", "message": "Container not found"} container = containers[0] @@ -242,12 +236,12 @@ class ContainerManager(QObject): except MimeTypeNotFoundError: return {"status": "error", "message": "Could not determine mime type of file"} - container_type = self._container_registry.getContainerForMimeType(mime_type) + container_type = CuraApplication.getInstance().getContainerRegistry().getContainerForMimeType(mime_type) if not container_type: return {"status": "error", "message": "Could not find a container to handle the specified file."} container_id = urllib.parse.unquote_plus(mime_type.stripExtension(os.path.basename(file_url))) - container_id = self._container_registry.uniqueName(container_id) + container_id = CuraApplication.getInstance().getContainerRegistry().uniqueName(container_id) container = container_type(container_id) @@ -263,7 +257,7 @@ class ContainerManager(QObject): container.setDirty(True) - self._container_registry.addContainer(container) + CuraApplication.getInstance().getContainerRegistry().addContainer(container) return {"status": "success", "message": "Successfully imported container {0}".format(container.getName())} @@ -275,44 +269,47 @@ class ContainerManager(QObject): # \return \type{bool} True if successful, False if not. @pyqtSlot(result = bool) def updateQualityChanges(self) -> bool: - global_stack = self._machine_manager.activeMachine + global_stack = MachineManager.getInstance().activeMachine if not global_stack: return False - self._machine_manager.blurSettings.emit() + MachineManager.getInstance().blurSettings.emit() current_quality_changes_name = global_stack.qualityChanges.getName() current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") extruder_stacks = list(global_stack.extruders.values()) + container_registry = CuraApplication.getInstance().getContainerRegistry() + quality_manager = QualityManager.getInstance() for stack in [global_stack] + extruder_stacks: # Find the quality_changes container for this stack and merge the contents of the top container into it. quality_changes = stack.qualityChanges if quality_changes.getId() == "empty_quality_changes": - quality_changes = self._quality_manager._createQualityChanges(current_quality_type, current_quality_changes_name, + quality_changes = quality_manager._createQualityChanges(current_quality_type, current_quality_changes_name, global_stack, stack) - self._container_registry.addContainer(quality_changes) + container_registry.addContainer(quality_changes) stack.qualityChanges = quality_changes - if not quality_changes or self._container_registry.isReadOnly(quality_changes.getId()): + if not quality_changes or container_registry.isReadOnly(quality_changes.getId()): Logger.log("e", "Could not update quality of a nonexistant or read only quality profile in stack %s", stack.getId()) continue self._performMerge(quality_changes, stack.getTop()) - self._machine_manager.activeQualityChangesGroupChanged.emit() + MachineManager.getInstance().activeQualityChangesGroupChanged.emit() return True ## Clear the top-most (user) containers of the active stacks. @pyqtSlot() def clearUserContainers(self) -> None: - self._machine_manager.blurSettings.emit() + machine_manager = MachineManager.getInstance() + machine_manager.blurSettings.emit() send_emits_containers = [] # Go through global and extruder stacks and clear their topmost container (the user settings). - global_stack = self._machine_manager.activeMachine + global_stack = machine_manager.activeMachine extruder_stacks = list(global_stack.extruders.values()) for stack in [global_stack] + extruder_stacks: container = stack.userChanges @@ -320,7 +317,7 @@ class ContainerManager(QObject): send_emits_containers.append(container) # user changes are possibly added to make the current setup match the current enabled extruders - self._machine_manager.correctExtruderSettings() + machine_manager.correctExtruderSettings() for container in send_emits_containers: container.sendPostponedEmits() @@ -334,7 +331,7 @@ class ContainerManager(QObject): guid = material_node.getMetaDataEntry("GUID", "") self_root_material_id = material_node.getMetaDataEntry("base_file") - material_group_list = self._material_manager.getMaterialGroupListByGUID(guid) + material_group_list = MaterialManager.getInstance().getMaterialGroupListByGUID(guid) linked_material_names = [] if material_group_list: @@ -349,7 +346,7 @@ class ContainerManager(QObject): @pyqtSlot("QVariant") def unlinkMaterial(self, material_node: "MaterialNode") -> None: # Get the material group - material_group = self._material_manager.getMaterialGroup(material_node.getMetaDataEntry("base_file", "")) + material_group = MaterialManager.getInstance().getMaterialGroup(material_node.getMetaDataEntry("base_file", "")) if material_group is None: Logger.log("w", "Unable to find material group for %s", material_node) @@ -377,14 +374,16 @@ class ContainerManager(QObject): def _updateContainerNameFilters(self) -> None: self._container_name_filters = {} - for plugin_id, container_type in self._container_registry.getContainerTypes(): + plugin_registry = CuraApplication.getInstance().getPluginRegistry() + container_registry = CuraApplication.getInstance().getContainerRegistry() + for plugin_id, container_type in container_registry.getContainerTypes(): # Ignore default container types since those are not plugins if container_type in (InstanceContainer, ContainerStack, DefinitionContainer): continue serialize_type = "" try: - plugin_metadata = self._plugin_registry.getMetaData(plugin_id) + plugin_metadata = plugin_registry.getMetaData(plugin_id) if plugin_metadata: serialize_type = plugin_metadata["settings_container"]["type"] else: @@ -392,7 +391,7 @@ class ContainerManager(QObject): except KeyError as e: continue - mime_type = self._container_registry.getMimeTypeForContainer(container_type) + mime_type = container_registry.getMimeTypeForContainer(container_type) if mime_type is None: continue entry = { @@ -428,7 +427,7 @@ class ContainerManager(QObject): path = file_url.toLocalFile() if not path: return {"status": "error", "message": catalog.i18nc("@info:status", "Invalid file URL:") + " " + str(file_url)} - return self._container_registry.importProfile(path) + return CuraApplication.getInstance().getContainerRegistry().importProfile(path) @pyqtSlot(QObject, QUrl, str) def exportQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", file_url: QUrl, file_type: str) -> None: @@ -439,7 +438,7 @@ class ContainerManager(QObject): return container_list = [n.getContainer() for n in quality_changes_group.getAllNodes() if n.getContainer() is not None] - self._container_registry.exportQualityProfile(container_list, path, file_type) + CuraApplication.getInstance().getContainerRegistry().exportQualityProfile(container_list, path, file_type) __instance = None # type: ContainerManager From 709584cc5e0ab6f35ffd39f8be169b1bda828787 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 15:14:52 +0200 Subject: [PATCH 117/994] No longer listen to qualitiesChanged signal to update It was only being called once upon initialisation. Turns out that this model updates itself properly only because the qualities don't change during runtime unless you change the active quality group (due to materials changing) or the printer itself. Contributes to issue CURA-6600. --- .../Models/QualityProfilesDropDownMenuModel.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index deabb6e9ba..1e30514029 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, QTimer @@ -36,14 +36,12 @@ class QualityProfilesDropDownMenuModel(ListModel): self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") self.addRoleName(self.IsExperimentalRole, "is_experimental") - self._application = Application.getInstance() - self._machine_manager = self._application.getMachineManager() - self._quality_manager = Application.getInstance().getQualityManager() + application = Application.getInstance() + self._machine_manager = application.getMachineManager() - self._application.globalContainerStackChanged.connect(self._onChange) + application.globalContainerStackChanged.connect(self._onChange) self._machine_manager.activeQualityGroupChanged.connect(self._onChange) self._machine_manager.extruderChanged.connect(self._onChange) - self._quality_manager.qualitiesUpdated.connect(self._onChange) self._layer_height_unit = "" # This is cached From 80e27b62d3f3639e141843054b0b81a67037dc69 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 9 Aug 2019 15:53:08 +0200 Subject: [PATCH 118/994] Don't cache singletons in constructor It makes it harder to test these things. Contributes to issue CURA-6600. --- .../Models/QualityProfilesDropDownMenuModel.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 1e30514029..b806ce8c1a 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -3,11 +3,11 @@ from PyQt5.QtCore import Qt, QTimer -from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel from UM.Settings.SettingFunction import SettingFunction +from cura.CuraApplication import CuraApplication from cura.Machines.QualityManager import QualityGroup @@ -36,12 +36,12 @@ class QualityProfilesDropDownMenuModel(ListModel): self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") self.addRoleName(self.IsExperimentalRole, "is_experimental") - application = Application.getInstance() - self._machine_manager = application.getMachineManager() + application = CuraApplication.getInstance() + machine_manager = application.getMachineManager() application.globalContainerStackChanged.connect(self._onChange) - self._machine_manager.activeQualityGroupChanged.connect(self._onChange) - self._machine_manager.extruderChanged.connect(self._onChange) + machine_manager.activeQualityGroupChanged.connect(self._onChange) + machine_manager.extruderChanged.connect(self._onChange) self._layer_height_unit = "" # This is cached @@ -58,14 +58,14 @@ class QualityProfilesDropDownMenuModel(ListModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - global_stack = self._machine_manager.activeMachine + global_stack = CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: self.setItems([]) Logger.log("d", "No active GlobalStack, set quality profile model as empty.") return # Check for material compatibility - if not self._machine_manager.activeMaterialsCompatible(): + if not CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): Logger.log("d", "No active material compatibility, set quality profile model as empty.") self.setItems([]) return @@ -94,7 +94,7 @@ class QualityProfilesDropDownMenuModel(ListModel): self.setItems(item_list) def _fetchLayerHeight(self, quality_group: "QualityGroup") -> float: - global_stack = self._machine_manager.activeMachine + global_stack = CuraApplication.getInstance().getMachineManager().activeMachine if not self._layer_height_unit: unit = global_stack.definition.getProperty("layer_height", "unit") if not unit: From 91e14a90b226c7f5d7ed94b960f34464cea2b475 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 14:02:19 +0200 Subject: [PATCH 119/994] Update getQualityGroups to use the new ContainerTree structure Look how greatly this is now simplified. The fallbacks for which material nodes to check is not yet implemented. Will do that next. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 206 ++++++-------------------------- 1 file changed, 36 insertions(+), 170 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index d90a20e10b..68dcd43d3c 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -14,6 +14,7 @@ from UM.Decorators import deprecated import cura.CuraApplication from cura.Settings.ExtruderStack import ExtruderStack +from cura.Machines.ContainerTree import ContainerTree # The implementation that replaces this manager, to keep the deprecated interface working. from .QualityGroup import QualityGroup from .QualityNode import QualityNode @@ -160,26 +161,6 @@ class QualityManager(QObject): # update the cache table self._update_timer.start() - # Updates the given quality groups' availabilities according to which extruders are being used/ enabled. - def _updateQualityGroupsAvailability(self, machine: "GlobalStack", quality_group_list) -> None: - used_extruders = set() - for i in range(machine.getProperty("machine_extruder_count", "value")): - if str(i) in machine.extruders and machine.extruders[str(i)].isEnabled: - used_extruders.add(str(i)) - - # Update the "is_available" flag for each quality group. - for quality_group in quality_group_list: - is_available = True - if quality_group.node_for_global is None: - is_available = False - if is_available: - for position in used_extruders: - if position not in quality_group.nodes_for_extruders: - is_available = False - break - - quality_group.is_available = is_available - # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) @@ -203,160 +184,45 @@ class QualityManager(QObject): return quality_changes_group_dict + ## Gets the quality groups for the current printer. # - # Gets all quality groups for the given machine. Both available and unavailable ones will be included. - # It returns a dictionary with "quality_type"s as keys and "QualityGroup"s as values. - # Whether a QualityGroup is available can be known via the field QualityGroup.is_available. - # For more details, see QualityGroup. - # - def getQualityGroups(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: - machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) + # Both available and unavailable quality groups will be included. Whether + # a quality group is available can be known via the field + # ``QualityGroup.is_available``. For more details, see QualityGroup. + # \return A dictionary with quality types as keys and the quality groups + # for those types as values. + def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: + definition_id = global_stack.definition.getId() + machine_node = ContainerTree.getInstance().machines[definition_id] - # To find the quality container for the GlobalStack, check in the following fall-back manner: - # (1) the machine-specific node - # (2) the generic node - machine_node = self._machine_nozzle_buildplate_material_quality_type_to_quality_dict.get(machine_definition_id) + # For each extruder, find which quality profiles are available. Later we'll intersect the quality types. + qualities_per_type_per_extruder = {} # type: Dict[str, Dict[str, QualityNode]] + for extruder_nr, extruder in global_stack.extruders.items(): + if not extruder.isEnabled: + continue # No qualities available in this extruder. It'll get skipped when intersecting the quality types. + nozzle_name = extruder.variant.getName() + material_base = extruder.material.getMetaDataEntry("base_file") + if nozzle_name not in machine_node.variants or material_base not in machine_node.variants[nozzle_name].materials: + # The printer has no variant/material-specific quality profiles. Return the global quality profiles. + qualities_per_type_per_extruder[extruder_nr] = machine_node.global_qualities + else: + # Use the actually specialised quality profiles. + qualities_per_type_per_extruder[extruder_nr] = machine_node.variants[nozzle_name].materials[material_base].qualities - # Check if this machine has specific quality profiles for its extruders, if so, when looking up extruder - # qualities, we should not fall back to use the global qualities. - has_extruder_specific_qualities = False - if machine_node: - if machine_node.children_map: - has_extruder_specific_qualities = True + # Create the quality group for each available type. + quality_groups = {} + for quality_type, global_quality_node in machine_node.global_qualities.items(): + quality_groups[quality_type].node_for_global = global_quality_node + quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + for extruder, qualities_per_type in qualities_per_type_per_extruder: + quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] - default_machine_node = self._machine_nozzle_buildplate_material_quality_type_to_quality_dict.get(self._default_machine_definition_id) - - nodes_to_check = [] # type: List[QualityNode] - if machine_node is not None: - nodes_to_check.append(machine_node) - if default_machine_node is not None: - nodes_to_check.append(default_machine_node) - - # Iterate over all quality_types in the machine node - quality_group_dict = {} - for node in nodes_to_check: - if node and node.quality_type_map: - quality_node = list(node.quality_type_map.values())[0] - is_global_quality = parseBool(quality_node.getMetaDataEntry("global_quality", False)) - if not is_global_quality: - continue - - for quality_type, quality_node in node.quality_type_map.items(): - quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) - quality_group.setGlobalNode(quality_node) - quality_group_dict[quality_type] = quality_group - break - - buildplate_name = machine.getBuildplateName() - - # Iterate over all extruders to find quality containers for each extruder - for position, extruder in machine.extruders.items(): - nozzle_name = None - if extruder.variant.getId() != "empty_variant": - nozzle_name = extruder.variant.getName() - - # This is a list of root material IDs to use for searching for suitable quality profiles. - # The root material IDs in this list are in prioritized order. - root_material_id_list = [] - has_material = False # flag indicating whether this extruder has a material assigned - root_material_id = None - if extruder.material.getId() != "empty_material": - has_material = True - root_material_id = extruder.material.getMetaDataEntry("base_file") - # Convert possible generic_pla_175 -> generic_pla - root_material_id = self._material_manager.getRootMaterialIDWithoutDiameter(root_material_id) - root_material_id_list.append(root_material_id) - - # Also try to get the fallback materials - fallback_ids = self._material_manager.getFallBackMaterialIdsByMaterial(extruder.material) - - if fallback_ids: - root_material_id_list.extend(fallback_ids) - - # Weed out duplicates while preserving the order. - seen = set() # type: Set[str] - root_material_id_list = [x for x in root_material_id_list if x not in seen and not seen.add(x)] # type: ignore - - # Here we construct a list of nodes we want to look for qualities with the highest priority first. - # The use case is that, when we look for qualities for a machine, we first want to search in the following - # order: - # 1. machine-nozzle-buildplate-and-material-specific qualities if exist - # 2. machine-nozzle-and-material-specific qualities if exist - # 3. machine-nozzle-specific qualities if exist - # 4. machine-material-specific qualities if exist - # 5. machine-specific global qualities if exist, otherwise generic global qualities - # NOTE: We DO NOT fail back to generic global qualities if machine-specific global qualities exist. - # This is because when a machine defines its own global qualities such as Normal, Fine, etc., - # it is intended to maintain those specific qualities ONLY. If we still fail back to the generic - # global qualities, there can be unimplemented quality types e.g. "coarse", and this is not - # correct. - # Each points above can be represented as a node in the lookup tree, so here we simply put those nodes into - # the list with priorities as the order. Later, we just need to loop over each node in this list and fetch - # qualities from there. - node_info_list_0 = [nozzle_name, buildplate_name, root_material_id] # type: List[Optional[str]] - nodes_to_check = [] - - # This function tries to recursively find the deepest (the most specific) branch and add those nodes to - # the search list in the order described above. So, by iterating over that search node list, we first look - # in the more specific branches and then the less specific (generic) ones. - def addNodesToCheck(node: Optional[QualityNode], nodes_to_check_list: List[QualityNode], node_info_list, node_info_idx: int) -> None: - if node is None: - return - - if node_info_idx < len(node_info_list): - node_name = node_info_list[node_info_idx] - if node_name is not None: - current_node = node.getChildNode(node_name) - if current_node is not None and has_material: - addNodesToCheck(current_node, nodes_to_check_list, node_info_list, node_info_idx + 1) - - if has_material: - for rmid in root_material_id_list: - material_node = node.getChildNode(rmid) - if material_node: - nodes_to_check_list.append(material_node) - break - - nodes_to_check_list.append(node) - - addNodesToCheck(machine_node, nodes_to_check, node_info_list_0, 0) - - # The last fall back will be the global qualities (either from the machine-specific node or the generic - # node), but we only use one. For details see the overview comments above. - - if machine_node is not None and machine_node.quality_type_map: - nodes_to_check += [machine_node] - elif default_machine_node is not None: - nodes_to_check += [default_machine_node] - - for node_idx, node in enumerate(nodes_to_check): - if node and node.quality_type_map: - if has_extruder_specific_qualities: - # Only include variant qualities; skip non global qualities - quality_node = list(node.quality_type_map.values())[0] - is_global_quality = parseBool(quality_node.getMetaDataEntry("global_quality", False)) - if is_global_quality: - continue - - for quality_type, quality_node in node.quality_type_map.items(): - if quality_type not in quality_group_dict: - quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) - quality_group_dict[quality_type] = quality_group - - quality_group = quality_group_dict[quality_type] - if position not in quality_group.nodes_for_extruders: - quality_group.setExtruderNode(position, quality_node) - - # If the machine has its own specific qualities, for extruders, it should skip the global qualities - # and use the material/variant specific qualities. - if has_extruder_specific_qualities: - if node_idx == len(nodes_to_check) - 1: - break - - # Update availabilities for each quality group - self._updateQualityGroupsAvailability(machine, quality_group_dict.values()) - - return quality_group_dict + available_quality_types = set(quality_groups.keys()) + for qualities_per_type in qualities_per_type_per_extruder.values(): + available_quality_types.intersection_update(qualities_per_type.keys()) + for quality_type in available_quality_types: + quality_groups[quality_type].is_available = True + return quality_groups def getQualityGroupsForMachineDefinition(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) From fff26bb0210f3b7fc2389fb842d7d104552bfcc9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 14:15:40 +0200 Subject: [PATCH 120/994] Fix imports and references to managers Use getInstance() where applicable. Contributes to issue CURA-6600. --- .../CustomQualityProfilesDropDownMenuModel.py | 8 +++++--- .../Models/QualityProfilesDropDownMenuModel.py | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index dcade8cb0d..ea1746acc8 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -1,9 +1,11 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Logger import Logger +import cura.CuraApplication # Imported this way to prevent circular references. from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel +from cura.Machines.QualityManager import QualityManager # @@ -14,13 +16,13 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - active_global_stack = self._machine_manager.activeMachine + active_global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine if active_global_stack is None: self.setItems([]) Logger.log("d", "No active GlobalStack, set %s as empty.", self.__class__.__name__) return - quality_changes_group_dict = self._quality_manager.getQualityChangesGroups(active_global_stack) + quality_changes_group_dict = QualityManager.getInstance().getQualityChangesGroups(active_global_stack) item_list = [] for key in sorted(quality_changes_group_dict, key = lambda name: name.upper()): diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index b806ce8c1a..8d6c024e8c 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -7,8 +7,8 @@ from UM.Logger import Logger from UM.Qt.ListModel import ListModel from UM.Settings.SettingFunction import SettingFunction -from cura.CuraApplication import CuraApplication -from cura.Machines.QualityManager import QualityGroup +import cura.CuraApplication # Imported this way to prevent circular dependencies. +from cura.Machines.QualityManager import QualityGroup, QualityManager # @@ -36,7 +36,7 @@ class QualityProfilesDropDownMenuModel(ListModel): self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") self.addRoleName(self.IsExperimentalRole, "is_experimental") - application = CuraApplication.getInstance() + application = cura.CuraApplication.CuraApplication.getInstance() machine_manager = application.getMachineManager() application.globalContainerStackChanged.connect(self._onChange) @@ -58,19 +58,19 @@ class QualityProfilesDropDownMenuModel(ListModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - global_stack = CuraApplication.getInstance().getGlobalContainerStack() + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: self.setItems([]) Logger.log("d", "No active GlobalStack, set quality profile model as empty.") return # Check for material compatibility - if not CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): + if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): Logger.log("d", "No active material compatibility, set quality profile model as empty.") self.setItems([]) return - quality_group_dict = self._quality_manager.getQualityGroups(global_stack) + quality_group_dict = QualityManager.getInstance().getQualityGroups(global_stack) item_list = [] for key in sorted(quality_group_dict): @@ -94,7 +94,7 @@ class QualityProfilesDropDownMenuModel(ListModel): self.setItems(item_list) def _fetchLayerHeight(self, quality_group: "QualityGroup") -> float: - global_stack = CuraApplication.getInstance().getMachineManager().activeMachine + global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine if not self._layer_height_unit: unit = global_stack.definition.getProperty("layer_height", "unit") if not unit: From 8f075b644d3d47e7c5975f71dab51ee17377fb6c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 14:18:51 +0200 Subject: [PATCH 121/994] Add global quality nodes to machine node This means that the parent of the quality node could be one of two types. A bit confusing. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 14 ++++++++++++-- cura/Machines/MaterialNode.py | 4 ++-- cura/Machines/QualityNode.py | 22 ++++++++++++++-------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 0e424101c0..cc08fd1ff3 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -7,6 +7,7 @@ from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode if TYPE_CHECKING: @@ -18,7 +19,8 @@ if TYPE_CHECKING: class MachineNode(ContainerNode): def __init__(self, container_id: str) -> None: super().__init__(container_id) - self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. + self.variants = {} # type: Dict[str, VariantNode] # Mapping variant names to their nodes. + self.global_qualities = {} # type: Dict[str, QualityNode] # Mapping quality types to the global quality for those types. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] @@ -37,12 +39,20 @@ class MachineNode(ContainerNode): ## (Re)loads all variants under this printer. def _loadAll(self): # Find all the variants for this definition ID. - variants = ContainerRegistry.getInstance().findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") + container_registry = ContainerRegistry.getInstance() + variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") for variant in variants: variant_name = variant["name"] if variant_name not in self.variants: self.variants[variant_name] = VariantNode(variant["id"], machine = self) + # Find the global qualities for this printer. + global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.container_id, global_quality = True) # First try specific to this printer. + if len(global_qualities) == 0: # This printer doesn't override the global qualities. + global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = True) # Otherwise pick the global global qualities. + for global_quality in global_qualities: + self.global_qualities[global_quality["quality_type"]] = QualityNode(global_quality["id"], parent = self) + ## When a variant gets added to the set of profiles, we need to update our # tree here. def _variantAdded(self, container: ContainerInterface): diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 51dc62837a..ffe1e56b35 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -37,7 +37,7 @@ class MaterialNode(ContainerNode): for quality in qualities: quality_id = quality["id"] if quality_id not in self.qualities: - self.qualities[quality_id] = QualityNode(quality_id, material = self) + self.qualities[quality_id] = QualityNode(quality_id, parent = self) def _qualityAdded(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "quality": @@ -50,4 +50,4 @@ class MaterialNode(ContainerNode): return # Doesn't match our configuration. quality_id = container.getId() - self.qualities[quality_id] = QualityNode(quality_id, material = self) \ No newline at end of file + self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 5c5f1264aa..3dad0e4434 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import Union, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface @@ -11,14 +11,15 @@ from cura.Machines.IntentNode import IntentNode if TYPE_CHECKING: from typing import Dict from cura.Machines.MaterialNode import MaterialNode + from cura.Machines.MachineNode import MachineNode ## Represents a material profile in the container tree. # # Its subcontainers are intent profiles. class QualityNode(ContainerNode): - def __init__(self, container_id: str, material: "MaterialNode") -> None: + def __init__(self, container_id: str, parent: Union["MaterialNode", "MachineNode"]) -> None: super().__init__(container_id) - self.material = material + self.parent = parent self.intents = {} # type: Dict[str, IntentNode] ContainerRegistry.getInstance().containerAdded.connect(self._intentAdded) self._loadAll() @@ -26,17 +27,22 @@ class QualityNode(ContainerNode): def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all intent profiles that fit the current configuration. - for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.material.variant.machine.quality_definition, variant = self.material.variant.variant_name, material = self.material.base_file): - self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) + if isinstance(self.parent, MaterialNode): # Not a global profile. + for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): + self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) + # Otherwise, there are no intents for global profiles. def _intentAdded(self, container: ContainerInterface) -> None: + from cura.Machines.MachineNode import MachineNode # Imported here to prevent circular imports. if container.getMetaDataEntry("type") != "intent": return # Not interested if it's not an intent. - if container.getMetaDataEntry("definition") != self.material.variant.machine.quality_definition: + if isinstance(self.parent, MachineNode): + return # Global profiles don't have intents. + if container.getMetaDataEntry("definition") != self.parent.variant.machine.quality_definition: return # Incorrect printer. - if container.getMetaDataEntry("variant") != self.material.variant.variant_name: + if container.getMetaDataEntry("variant") != self.parent.variant.variant_name: return # Incorrect variant. - if container.getMetaDataEntry("material") != self.material.base_file: + if container.getMetaDataEntry("material") != self.parent.base_file: return # Incorrect material. container_id = container.getId() if container_id in self.intents: From 74b65012359254b3a3b36c952c1540a222231c82 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 14:39:43 +0200 Subject: [PATCH 122/994] Check for MachineNode instead of MaterialNode I thought I already changed that, but not apparently. Contributes to issue CURA-6600. --- cura/Machines/QualityNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 3dad0e4434..82bdf2ce9e 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -27,7 +27,7 @@ class QualityNode(ContainerNode): def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all intent profiles that fit the current configuration. - if isinstance(self.parent, MaterialNode): # Not a global profile. + if not isinstance(self.parent, MachineNode): # Not a global profile. for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) # Otherwise, there are no intents for global profiles. From 99afa6b5330db5e6019e59f2679661e4eb984239 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 14:47:28 +0200 Subject: [PATCH 123/994] Fix import issue CURA-6600 --- cura/Machines/QualityNode.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 82bdf2ce9e..8e58700589 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -27,6 +27,7 @@ class QualityNode(ContainerNode): def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all intent profiles that fit the current configuration. + from cura.Machines.MachineNode import MachineNode if not isinstance(self.parent, MachineNode): # Not a global profile. for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) From 6cea609b569e9d972edc74a705b7dc268b1977c3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 14:52:05 +0200 Subject: [PATCH 124/994] Fix intentManager test Since we changed how the QualityManager is constructed, the test should change as well CURA-6600 --- tests/TestIntentManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 337af817d1..1e2786ca6e 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -9,12 +9,13 @@ from cura.Machines.QualityManager import QualityManager from tests.Settings.MockContainer import MockContainer + @pytest.fixture() def quality_manager(application, container_registry, global_stack) -> QualityManager: application.getGlobalContainerStack = MagicMock(return_value = global_stack) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - manager = QualityManager(application) + manager = QualityManager() return manager From 98686dd088cc1c1f31b665a3eea21ca2ab2da62a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 15:03:25 +0200 Subject: [PATCH 125/994] Fix imports for CuraApplication Also removed two unused imports. Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index cc3a59ddb3..ea4104235d 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -20,6 +20,7 @@ from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.InstanceContainer import InstanceContainer +import cura.CuraApplication if TYPE_CHECKING: @@ -27,11 +28,9 @@ if TYPE_CHECKING: from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup - from UM.PluginRegistry import PluginRegistry from cura.Settings.MachineManager import MachineManager from cura.Machines.MaterialManager import MaterialManager from cura.Machines.QualityManager import QualityManager - from cura.Settings.CuraContainerRegistry import CuraContainerRegistry catalog = i18nCatalog("cura") @@ -56,7 +55,7 @@ class ContainerManager(QObject): @pyqtSlot(str, str, result=str) def getContainerMetaDataEntry(self, container_id: str, entry_names: str) -> str: - metadatas = CuraApplication.getInstance().getContainerRegistry().findContainersMetadata(id = container_id) + metadatas = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().findContainersMetadata(id = container_id) if not metadatas: Logger.log("w", "Could not get metadata of container %s because it was not found.", container_id) return "" @@ -86,7 +85,7 @@ class ContainerManager(QObject): @pyqtSlot("QVariant", str, str) def setContainerMetaDataEntry(self, container_node: "ContainerNode", entry_name: str, entry_value: str) -> bool: root_material_id = container_node.getMetaDataEntry("base_file", "") - if CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): + if cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) return False @@ -123,7 +122,7 @@ class ContainerManager(QObject): @pyqtSlot(str, result = str) def makeUniqueName(self, original_name: str) -> str: - return CuraApplication.getInstance().getContainerRegistry().uniqueName(original_name) + return cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().uniqueName(original_name) ## Get a list of string that can be used as name filters for a Qt File Dialog # @@ -178,7 +177,7 @@ class ContainerManager(QObject): else: mime_type = self._container_name_filters[file_type]["mime"] - containers = CuraApplication.getInstance().getContainerRegistry().findContainers(id = container_id) + containers = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().findContainers(id = container_id) if not containers: return {"status": "error", "message": "Container not found"} container = containers[0] @@ -236,12 +235,13 @@ class ContainerManager(QObject): except MimeTypeNotFoundError: return {"status": "error", "message": "Could not determine mime type of file"} - container_type = CuraApplication.getInstance().getContainerRegistry().getContainerForMimeType(mime_type) + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + container_type = container_registry.getContainerForMimeType(mime_type) if not container_type: return {"status": "error", "message": "Could not find a container to handle the specified file."} container_id = urllib.parse.unquote_plus(mime_type.stripExtension(os.path.basename(file_url))) - container_id = CuraApplication.getInstance().getContainerRegistry().uniqueName(container_id) + container_id = container_registry.uniqueName(container_id) container = container_type(container_id) @@ -257,7 +257,7 @@ class ContainerManager(QObject): container.setDirty(True) - CuraApplication.getInstance().getContainerRegistry().addContainer(container) + container_registry.addContainer(container) return {"status": "success", "message": "Successfully imported container {0}".format(container.getName())} @@ -278,7 +278,7 @@ class ContainerManager(QObject): current_quality_changes_name = global_stack.qualityChanges.getName() current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") extruder_stacks = list(global_stack.extruders.values()) - container_registry = CuraApplication.getInstance().getContainerRegistry() + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() quality_manager = QualityManager.getInstance() for stack in [global_stack] + extruder_stacks: # Find the quality_changes container for this stack and merge the contents of the top container into it. @@ -374,8 +374,8 @@ class ContainerManager(QObject): def _updateContainerNameFilters(self) -> None: self._container_name_filters = {} - plugin_registry = CuraApplication.getInstance().getPluginRegistry() - container_registry = CuraApplication.getInstance().getContainerRegistry() + plugin_registry = cura.CuraApplication.CuraApplication.getInstance().getPluginRegistry() + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() for plugin_id, container_type in container_registry.getContainerTypes(): # Ignore default container types since those are not plugins if container_type in (InstanceContainer, ContainerStack, DefinitionContainer): @@ -427,7 +427,7 @@ class ContainerManager(QObject): path = file_url.toLocalFile() if not path: return {"status": "error", "message": catalog.i18nc("@info:status", "Invalid file URL:") + " " + str(file_url)} - return CuraApplication.getInstance().getContainerRegistry().importProfile(path) + return cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().importProfile(path) @pyqtSlot(QObject, QUrl, str) def exportQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", file_url: QUrl, file_type: str) -> None: @@ -438,7 +438,7 @@ class ContainerManager(QObject): return container_list = [n.getContainer() for n in quality_changes_group.getAllNodes() if n.getContainer() is not None] - CuraApplication.getInstance().getContainerRegistry().exportQualityProfile(container_list, path, file_type) + cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().exportQualityProfile(container_list, path, file_type) __instance = None # type: ContainerManager From fc3461d8655a883540787922c9597876c29ddb86 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 15:11:59 +0200 Subject: [PATCH 126/994] Fix the machine node test CURA-6600 --- tests/Machines/TestMachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index d0fe8c65ba..db3946fc3a 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -18,7 +18,7 @@ metadata_dict = {} @pytest.fixture def container_registry(): result = MagicMock() - result.findInstanceContainersMetadata = MagicMock(return_value = [{"id": "variant_1", "name": "Variant One"}, {"id": "variant_2", "name": "Variant Two"}]) + result.findInstanceContainersMetadata = MagicMock(return_value = [{"id": "variant_1", "name": "Variant One", "quality_type": "normal"}, {"id": "variant_2", "name": "Variant Two", "quality_type": "great"}]) return result From 719e69692cf6c5832f87f83050b92c4127476951 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 15:20:09 +0200 Subject: [PATCH 127/994] Fix import issues CURA-6600 --- cura/Machines/MachineNode.py | 8 ++++++-- cura/Settings/ContainerManager.py | 9 ++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index cc08fd1ff3..b474ae94bd 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -3,6 +3,7 @@ from typing import TYPE_CHECKING +from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from UM.Settings.Interfaces import ContainerInterface @@ -22,8 +23,11 @@ class MachineNode(ContainerNode): self.variants = {} # type: Dict[str, VariantNode] # Mapping variant names to their nodes. self.global_qualities = {} # type: Dict[str, QualityNode] # Mapping quality types to the global quality for those types. container_registry = ContainerRegistry.getInstance() - - my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + try: + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + except IndexError: + Logger.log("Unable to find metadata for container %s", container_id) + my_metadata = {} # Some of the metadata is cached upon construction here. # ONLY DO THAT FOR METADATA THAT DOESN'T CHANGE DURING RUNTIME! # Otherwise you need to keep it up-to-date during runtime. diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index ea4104235d..bab8efb775 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -28,7 +28,6 @@ if TYPE_CHECKING: from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup - from cura.Settings.MachineManager import MachineManager from cura.Machines.MaterialManager import MaterialManager from cura.Machines.QualityManager import QualityManager @@ -269,11 +268,11 @@ class ContainerManager(QObject): # \return \type{bool} True if successful, False if not. @pyqtSlot(result = bool) def updateQualityChanges(self) -> bool: - global_stack = MachineManager.getInstance().activeMachine + global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine if not global_stack: return False - MachineManager.getInstance().blurSettings.emit() + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().blurSettings.emit() current_quality_changes_name = global_stack.qualityChanges.getName() current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") @@ -296,14 +295,14 @@ class ContainerManager(QObject): self._performMerge(quality_changes, stack.getTop()) - MachineManager.getInstance().activeQualityChangesGroupChanged.emit() + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeQualityChangesGroupChanged.emit() return True ## Clear the top-most (user) containers of the active stacks. @pyqtSlot() def clearUserContainers(self) -> None: - machine_manager = MachineManager.getInstance() + machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() machine_manager.blurSettings.emit() send_emits_containers = [] From e18820b846d0877e6c288c06f626b67f466c31da Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 15:37:19 +0200 Subject: [PATCH 128/994] Fix tests for ContainerManager CURA-6600 --- cura/Settings/IntentManager.py | 1 - tests/Settings/TestContainerManager.py | 32 +++++++++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 17e793b948..5a3c1a737f 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -143,7 +143,6 @@ class IntentManager(QObject): extruder_stack.intent = intent[0] else: extruder_stack.intent = self.getDefaultIntent() - application.getMachineManager().setQualityGroupByQualityType(quality_type) if old_intent_category != intent_category: self.intentCategoryChanged.emit() diff --git a/tests/Settings/TestContainerManager.py b/tests/Settings/TestContainerManager.py index f4aa140b6b..ff23b727e6 100644 --- a/tests/Settings/TestContainerManager.py +++ b/tests/Settings/TestContainerManager.py @@ -2,7 +2,7 @@ from unittest import TestCase from unittest.mock import MagicMock from PyQt5.QtCore import QUrl - +from unittest.mock import patch from UM.MimeTypeDatabase import MimeTypeDatabase from cura.Settings.ContainerManager import ContainerManager import tempfile @@ -42,20 +42,23 @@ class TestContainerManager(TestCase): MimeTypeDatabase.removeMimeType(self._mocked_mime) def test_getContainerMetaDataEntry(self): - assert self._container_manager.getContainerMetaDataEntry("test", "test_data") == "omg" - assert self._container_manager.getContainerMetaDataEntry("test", "entry_that_is_not_defined") == "" + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)): + assert self._container_manager.getContainerMetaDataEntry("test", "test_data") == "omg" + assert self._container_manager.getContainerMetaDataEntry("test", "entry_that_is_not_defined") == "" def test_clearUserContainer(self): - self._container_manager.clearUserContainers() + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)): + self._container_manager.clearUserContainers() assert self._machine_manager.activeMachine.userChanges.clear.call_count == 1 def test_getContainerNameFilters(self): - # If nothing is added, we still expect to get the all files filter - assert self._container_manager.getContainerNameFilters("") == ['All Files (*)'] + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)): + # If nothing is added, we still expect to get the all files filter + assert self._container_manager.getContainerNameFilters("") == ['All Files (*)'] - # Pretend that a new type was added. - self._container_registry.getContainerTypes = MagicMock(return_value=[("None", None)]) - assert self._container_manager.getContainerNameFilters("") == ['UnitTest! (*.omg)', 'All Files (*)'] + # Pretend that a new type was added. + self._container_registry.getContainerTypes = MagicMock(return_value=[("None", None)]) + assert self._container_manager.getContainerNameFilters("") == ['UnitTest! (*.omg)', 'All Files (*)'] def test_exportContainerUnknownFileType(self): # The filetype is not known, so this should cause an error! @@ -69,8 +72,9 @@ class TestContainerManager(TestCase): assert self._container_manager.exportContainer("", "whatever", "whatever")["status"] == "error" def test_exportContainer(self): - with tempfile.TemporaryDirectory() as tmpdirname: - result = self._container_manager.exportContainer("test", "whatever", os.path.join(tmpdirname, "whatever.omg")) - assert(os.path.exists(result["path"])) - with open(result["path"], "r", encoding="utf-8") as f: - assert f.read() == self._mocked_container_data + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)): + with tempfile.TemporaryDirectory() as tmpdirname: + result = self._container_manager.exportContainer("test", "whatever", os.path.join(tmpdirname, "whatever.omg")) + assert(os.path.exists(result["path"])) + with open(result["path"], "r", encoding="utf-8") as f: + assert f.read() == self._mocked_container_data \ No newline at end of file From e08feb109964f0ac867f9c89a8e798cd2b397d50 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Aug 2019 16:32:59 +0200 Subject: [PATCH 129/994] Fix final set of broken tests CURA-6600 --- cura/Settings/MachineManager.py | 2 +- tests/Settings/TestCuraStackBuilder.py | 1 + tests/TestMachineManager.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aec85f9260..aedd84fa54 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1533,7 +1533,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return # Get all the quality groups for this global stack and filter out by quality_type - quality_group_dict = QualityManager.getInstance().getQualityGroups(self._global_container_stack) + quality_group_dict = self._application.getQualityManager().getQualityGroups(self._global_container_stack) quality_group = quality_group_dict[quality_type] self.setQualityGroup(quality_group) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 300536f756..95accdb6e3 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -62,6 +62,7 @@ def test_createMachine(application, container_registry, definition_container, gl application.empty_material_container = material_instance_container application.empty_quality_container = quality_container application.empty_quality_changes_container = quality_changes_container + application.empty_variant_container = global_variant metadata = definition_container.getMetaData() metadata["machine_extruder_trains"] = {} diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py index e91cffb172..2b68b824da 100644 --- a/tests/TestMachineManager.py +++ b/tests/TestMachineManager.py @@ -2,6 +2,7 @@ from unittest.mock import MagicMock, patch import pytest +@pytest.mark.skip(reason = "Outdated test") def test_setActiveMachine(machine_manager): registry = MagicMock() From b1fb843f094ca2a1722809b302895aae6e43f78a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 16:15:03 +0200 Subject: [PATCH 130/994] Implement matching qualities by material_id with same material type OR GUID This fallback with the GUID makes this part a lot more complex, but in theory it should work. I hope that we can get some tests to debug this because it's 90% made from the top of my head now. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 36 ++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index ffe1e56b35..f9b01a2dcd 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -32,7 +32,16 @@ class MaterialNode(ContainerNode): if not self.variant.machine.has_machine_quality: # Need to find the global qualities. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") else: - qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.base_file) + # Need to find the qualities that specify a material profile with the same material type. + my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] + my_material_type = my_metadata.get("material") + qualities = [] + for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): + qualities.extend(container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = material_metadata["id"])) + if not qualities: # No quality profiles found. Go by GUID then. + my_guid = my_metadata.get("material") + for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): + qualities.extend(container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = material_metadata["id"])) for quality in qualities: quality_id = quality["id"] @@ -46,8 +55,29 @@ class MaterialNode(ContainerNode): if container.getMetaDataEntry("definition") != "fdmprinter": return # Only want global qualities. else: - if container.getMetaDataEntry("definition") != self.variant.machine.quality_definition or container.getMetaDataEntry("variant") != self.variant.variant_name or container.getMetaDataEntry("material") != self.base_file: - return # Doesn't match our configuration. + if container.getMetaDataEntry("definition") != self.variant.machine.quality_definition: + return # Doesn't match the machine. + if container.getMetaDataEntry("variant") != self.variant.variant_name: + return # Doesn't match the variant. + # Detect if we're falling back to matching via GUID. + # If so, we might need to erase the current list and put just this one in (i.e. no longer use the fallback). + container_registry = ContainerRegistry.getInstance() + my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] + my_material_type = my_metadata.get("material") + allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type)} + is_fallback_guid = len(self.qualities) == 0 or next(iter(self.qualities.values())).getMetaDataEntry("material") not in allowed_material_ids # Select any quality profile; if the material is not matching by material type, we've been falling back to GUID. + + if is_fallback_guid and container.getMetaDataEntry("material") in allowed_material_ids: # So far we needed the fallback, but no longer! + self.qualities.clear() + else: + if not is_fallback_guid: + if container.getMetaDataEntry("material") not in allowed_material_ids: + return # Doesn't match the material type. + else: + my_material_guid = my_metadata["guid"] + allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_material_guid)} + if container.getMetaDataEntry("material") not in allowed_material_ids: + return # Doesn't match the material GUID. quality_id = container.getId() self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file From 1bd287f8885ed7a8e23aa50b45454bd4a54e29e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 16:36:43 +0200 Subject: [PATCH 131/994] Move getting variant manager out of the loop This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal. Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 241d1a954f..3e02f660d1 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -608,6 +608,7 @@ class XmlMaterialProfile(InstanceContainer): # Map machine human-readable names to IDs product_id_map = self.getProductIdMap() + variant_manager = CuraApplication.getInstance().getVariantManager() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: machine_compatibility = common_compatibility @@ -702,7 +703,6 @@ class XmlMaterialProfile(InstanceContainer): if buildplate_id is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, buildplate_id, variant_type = VariantType.BUILD_PLATE) if not variant_node: @@ -725,7 +725,6 @@ class XmlMaterialProfile(InstanceContainer): if hotend_name is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, hotend_name, VariantType.NOZZLE) if not variant_node: continue @@ -777,7 +776,6 @@ class XmlMaterialProfile(InstanceContainer): if buildplate_name is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, buildplate_name, VariantType.BUILD_PLATE) if not variant_node: continue From 5bbb44bfdfdc9e0651e1b480ca6c734d53569a7f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 16:49:25 +0200 Subject: [PATCH 132/994] Remove buildplate loading of materials and don't check if variant is there So now we no longer make material subprofiles per buildplate. And now we create subprofiles for variants regardless if the variant exists or not. Contributes to issue CURA-6600. --- .../XmlMaterialProfile/XmlMaterialProfile.py | 88 +------------------ 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 3e02f660d1..ae59ec181a 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,6 +17,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from cura.CuraApplication import CuraApplication +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType from .XmlMaterialValidator import XmlMaterialValidator @@ -608,7 +609,6 @@ class XmlMaterialProfile(InstanceContainer): # Map machine human-readable names to IDs product_id_map = self.getProductIdMap() - variant_manager = CuraApplication.getInstance().getVariantManager() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: machine_compatibility = common_compatibility @@ -693,31 +693,6 @@ class XmlMaterialProfile(InstanceContainer): if is_new_material: containers_to_add.append(new_material) - # Find the buildplates compatibility - buildplates = machine.iterfind("./um:buildplate", self.__namespaces) - buildplate_map = {} - buildplate_map["buildplate_compatible"] = {} - buildplate_map["buildplate_recommended"] = {} - for buildplate in buildplates: - buildplate_id = buildplate.get("id") - if buildplate_id is None: - continue - - variant_node = variant_manager.getVariantNode(machine_id, buildplate_id, - variant_type = VariantType.BUILD_PLATE) - if not variant_node: - continue - - _, buildplate_unmapped_settings_dict = self._getSettingsDictForNode(buildplate) - - buildplate_compatibility = buildplate_unmapped_settings_dict.get("hardware compatible", - machine_compatibility) - buildplate_recommended = buildplate_unmapped_settings_dict.get("hardware recommended", - machine_compatibility) - - buildplate_map["buildplate_compatible"][buildplate_id] = buildplate_compatibility - buildplate_map["buildplate_recommended"][buildplate_id] = buildplate_recommended - hotends = machine.iterfind("./um:hotend", self.__namespaces) for hotend in hotends: # The "id" field for hotends in material profiles is actually name @@ -725,10 +700,6 @@ class XmlMaterialProfile(InstanceContainer): if hotend_name is None: continue - variant_node = variant_manager.getVariantNode(machine_id, hotend_name, VariantType.NOZZLE) - if not variant_node: - continue - hotend_mapped_settings, hotend_unmapped_settings = self._getSettingsDictForNode(hotend) hotend_compatibility = hotend_unmapped_settings.get("hardware compatible", machine_compatibility) @@ -752,9 +723,6 @@ class XmlMaterialProfile(InstanceContainer): new_hotend_material.getMetaData()["compatible"] = hotend_compatibility new_hotend_material.getMetaData()["machine_manufacturer"] = machine_manufacturer new_hotend_material.getMetaData()["definition"] = machine_id - if buildplate_map["buildplate_compatible"]: - new_hotend_material.getMetaData()["buildplate_compatible"] = buildplate_map["buildplate_compatible"] - new_hotend_material.getMetaData()["buildplate_recommended"] = buildplate_map["buildplate_recommended"] cached_hotend_setting_properties = cached_machine_setting_properties.copy() cached_hotend_setting_properties.update(hotend_mapped_settings) @@ -766,60 +734,6 @@ class XmlMaterialProfile(InstanceContainer): if is_new_material: containers_to_add.append(new_hotend_material) - # - # Build plates in hotend - # - buildplates = hotend.iterfind("./um:buildplate", self.__namespaces) - for buildplate in buildplates: - # The "id" field for buildplate in material profiles is actually name - buildplate_name = buildplate.get("id") - if buildplate_name is None: - continue - - variant_node = variant_manager.getVariantNode(machine_id, buildplate_name, VariantType.BUILD_PLATE) - if not variant_node: - continue - - buildplate_mapped_settings, buildplate_unmapped_settings = self._getSettingsDictForNode(buildplate) - buildplate_compatibility = buildplate_unmapped_settings.get("hardware compatible", - buildplate_map["buildplate_compatible"]) - buildplate_recommended = buildplate_unmapped_settings.get("hardware recommended", - buildplate_map["buildplate_recommended"]) - - # Generate container ID for the hotend-and-buildplate-specific material container - new_hotend_and_buildplate_specific_material_id = new_hotend_specific_material_id + "_" + buildplate_name.replace(" ", "_") - - # Same as machine compatibility, keep the derived material containers consistent with the parent material - if ContainerRegistry.getInstance().isLoaded(new_hotend_and_buildplate_specific_material_id): - new_hotend_and_buildplate_material = ContainerRegistry.getInstance().findContainers(id = new_hotend_and_buildplate_specific_material_id)[0] - is_new_material = False - else: - new_hotend_and_buildplate_material = XmlMaterialProfile(new_hotend_and_buildplate_specific_material_id) - is_new_material = True - - new_hotend_and_buildplate_material.setMetaData(copy.deepcopy(new_hotend_material.getMetaData())) - new_hotend_and_buildplate_material.getMetaData()["id"] = new_hotend_and_buildplate_specific_material_id - new_hotend_and_buildplate_material.getMetaData()["name"] = self.getName() - new_hotend_and_buildplate_material.getMetaData()["variant_name"] = hotend_name - new_hotend_and_buildplate_material.getMetaData()["buildplate_name"] = buildplate_name - new_hotend_and_buildplate_material.setDefinition(machine_id) - # Don't use setMetadata, as that overrides it for all materials with same base file - new_hotend_and_buildplate_material.getMetaData()["compatible"] = buildplate_compatibility - new_hotend_and_buildplate_material.getMetaData()["machine_manufacturer"] = machine_manufacturer - new_hotend_and_buildplate_material.getMetaData()["definition"] = machine_id - new_hotend_and_buildplate_material.getMetaData()["buildplate_compatible"] = buildplate_compatibility - new_hotend_and_buildplate_material.getMetaData()["buildplate_recommended"] = buildplate_recommended - - cached_hotend_and_buildplate_setting_properties = cached_hotend_setting_properties.copy() - cached_hotend_and_buildplate_setting_properties.update(buildplate_mapped_settings) - - new_hotend_and_buildplate_material.setCachedValues(cached_hotend_and_buildplate_setting_properties) - - new_hotend_and_buildplate_material._dirty = False - - if is_new_material: - containers_to_add.append(new_hotend_and_buildplate_material) - # there is only one ID for a machine. Once we have reached here, it means we have already found # a workable ID for that machine, so there is no need to continue break From 42ba9a9f396a9e7514ece5efd45ea915cbd187a1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 17:13:25 +0200 Subject: [PATCH 133/994] Pre-filter qualities on other properties before filtering on material This prevents a LOT of double queries. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index f9b01a2dcd..8b7946ebc8 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -36,12 +36,13 @@ class MaterialNode(ContainerNode): my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] my_material_type = my_metadata.get("material") qualities = [] + qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): - qualities.extend(container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = material_metadata["id"])) + qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) if not qualities: # No quality profiles found. Go by GUID then. my_guid = my_metadata.get("material") for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): - qualities.extend(container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = material_metadata["id"])) + qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) for quality in qualities: quality_id = quality["id"] From 447b1b9645aa99573379c0313cbe2cb41330c7f4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 17:14:11 +0200 Subject: [PATCH 134/994] Actually import MaterialManager Because this class is being used. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aedd84fa54..7573e3309a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -22,7 +22,9 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique +from cura.Machines.MaterialManager import MaterialManager from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager + from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel @@ -43,7 +45,6 @@ if TYPE_CHECKING: from cura.CuraApplication import CuraApplication from cura.Settings.CuraContainerStack import CuraContainerStack from cura.Settings.GlobalStack import GlobalStack - from cura.Machines.MaterialManager import MaterialManager from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityGroup import QualityGroup From ee0f2d27733b1ce6ca0a89b7f2436687eb7d58d2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 17:18:22 +0200 Subject: [PATCH 135/994] Improve documentation Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 8b7946ebc8..c18e8aae22 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -66,10 +66,11 @@ class MaterialNode(ContainerNode): my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] my_material_type = my_metadata.get("material") allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type)} - is_fallback_guid = len(self.qualities) == 0 or next(iter(self.qualities.values())).getMetaDataEntry("material") not in allowed_material_ids # Select any quality profile; if the material is not matching by material type, we've been falling back to GUID. + # Select any quality profile; if the material is not matching by material type, we've been falling back to GUID all along. + is_fallback_guid = len(self.qualities) == 0 or next(iter(self.qualities.values())).getMetaDataEntry("material") not in allowed_material_ids if is_fallback_guid and container.getMetaDataEntry("material") in allowed_material_ids: # So far we needed the fallback, but no longer! - self.qualities.clear() + self.qualities.clear() # It'll get filled with the new quality profile then. else: if not is_fallback_guid: if container.getMetaDataEntry("material") not in allowed_material_ids: From 71aed6858c33b35c777e3ef016b474796f020e9d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 17:21:26 +0200 Subject: [PATCH 136/994] Fix getting GUID from metadata Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index c18e8aae22..5fa28de77f 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -76,7 +76,7 @@ class MaterialNode(ContainerNode): if container.getMetaDataEntry("material") not in allowed_material_ids: return # Doesn't match the material type. else: - my_material_guid = my_metadata["guid"] + my_material_guid = my_metadata.get("GUID") allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_material_guid)} if container.getMetaDataEntry("material") not in allowed_material_ids: return # Doesn't match the material GUID. From 2bf4ac8522c4a7cce8eafcbf1e4e2fa9ad4acbc2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 17:29:05 +0200 Subject: [PATCH 137/994] No longer trigger rebuilding node tree from quality manager Also remove part of that from the material manager while we're at it. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 86 --------------------- plugins/3MFReader/ThreeMFWorkspaceReader.py | 7 -- 2 files changed, 93 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 68dcd43d3c..b141434437 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -67,89 +67,6 @@ class QualityManager(QObject): self._container_registry.containerAdded.connect(self._onContainerMetadataChanged) self._container_registry.containerRemoved.connect(self._onContainerMetadataChanged) - # When a custom quality gets added/imported, there can be more than one InstanceContainers. In those cases, - # we don't want to react on every container/metadata changed signal. The timer here is to buffer it a bit so - # we don't react too many time. - self._update_timer = QTimer(self) - self._update_timer.setInterval(300) - self._update_timer.setSingleShot(True) - self._update_timer.timeout.connect(self._updateMaps) - - def initialize(self) -> None: - - # Initialize the lookup tree for quality profiles with following structure: - # -> -> -> - # -> - - self._machine_nozzle_buildplate_material_quality_type_to_quality_dict = {} # for quality lookup - self._machine_quality_type_to_quality_changes_dict = {} # for quality_changes lookup - - quality_metadata_list = self._container_registry.findContainersMetadata(type = "quality") - for metadata in quality_metadata_list: - if metadata["id"] == "empty_quality": - continue - - definition_id = metadata["definition"] - quality_type = metadata["quality_type"] - - root_material_id = metadata.get("material") - nozzle_name = metadata.get("variant") - buildplate_name = metadata.get("buildplate") - is_global_quality = metadata.get("global_quality", False) - is_global_quality = is_global_quality or (root_material_id is None and nozzle_name is None and buildplate_name is None) - - # Sanity check: material+variant and is_global_quality cannot be present at the same time - if is_global_quality and (root_material_id or nozzle_name): - ConfigurationErrorMessage.getInstance().addFaultyContainers(metadata["id"]) - continue - - if definition_id not in self._machine_nozzle_buildplate_material_quality_type_to_quality_dict: - self._machine_nozzle_buildplate_material_quality_type_to_quality_dict[definition_id] = QualityNode() - machine_node = cast(QualityNode, self._machine_nozzle_buildplate_material_quality_type_to_quality_dict[definition_id]) - - if is_global_quality: - # For global qualities, save data in the machine node - machine_node.addQualityMetadata(quality_type, metadata) - continue - - current_node = machine_node - intermediate_node_info_list = [nozzle_name, buildplate_name, root_material_id] - current_intermediate_node_info_idx = 0 - - while current_intermediate_node_info_idx < len(intermediate_node_info_list): - node_name = intermediate_node_info_list[current_intermediate_node_info_idx] - if node_name is not None: - # There is specific information, update the current node to go deeper so we can add this quality - # at the most specific branch in the lookup tree. - if node_name not in current_node.children_map: - current_node.children_map[node_name] = QualityNode() - current_node = cast(QualityNode, current_node.children_map[node_name]) - - current_intermediate_node_info_idx += 1 - - current_node.addQualityMetadata(quality_type, metadata) - - # Initialize the lookup tree for quality_changes profiles with following structure: - # -> -> - quality_changes_metadata_list = self._container_registry.findContainersMetadata(type = "quality_changes") - for metadata in quality_changes_metadata_list: - if metadata["id"] == "empty_quality_changes": - continue - - machine_definition_id = metadata["definition"] - quality_type = metadata["quality_type"] - - if machine_definition_id not in self._machine_quality_type_to_quality_changes_dict: - self._machine_quality_type_to_quality_changes_dict[machine_definition_id] = QualityNode() - machine_node = self._machine_quality_type_to_quality_changes_dict[machine_definition_id] - machine_node.addQualityChangesMetadata(quality_type, metadata) - - Logger.log("d", "Lookup tables updated.") - self.qualitiesUpdated.emit() - - def _updateMaps(self) -> None: - self.initialize() - def _onContainerMetadataChanged(self, container: InstanceContainer) -> None: self._onContainerChanged(container) @@ -158,9 +75,6 @@ class QualityManager(QObject): if container_type not in ("quality", "quality_changes"): return - # update the cache table - self._update_timer.start() - # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 8a18d1b698..be5f72a82f 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -919,9 +919,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): application = CuraApplication.getInstance() material_manager = application.getMaterialManager() - # Force update lookup tables first - material_manager.initialize() - for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: continue @@ -979,10 +976,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): material_manager = Application.getInstance().getMaterialManager() quality_manager = Application.getInstance().getQualityManager() - # Force update the lookup maps first - material_manager.initialize() - quality_manager.initialize() - machine_manager.setActiveMachine(global_stack.getId()) if self._quality_changes_to_apply: From 3e5c693e8939b4cf86fa37f7f711d26e42935a32 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 13 Aug 2019 09:19:54 +0200 Subject: [PATCH 138/994] Fix gitlab runner tags --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4a4d0771a..77920d547e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,13 @@ image: registry.gitlab.com/ultimaker/cura/cura-build-environment:centos7 stages: - build -build-and-test: + +build and test linux: stage: build + tags: + - cura + - docker + - linux script: - docker/build.sh artifacts: From 349f4ccf28fc588dae33e6189c19c1ac493a6d30 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 13 Aug 2019 09:26:34 +0200 Subject: [PATCH 139/994] Fix test command for plugins --- cmake/CuraTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index c0762e2b91..b1d3e0ddc4 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -47,7 +47,7 @@ function(cura_add_test) if (NOT ${test_exists}) add_test( NAME ${_NAME} - COMMAND ${Python3_EXECUTABLE} -m pytest --verbose --full-trace --capture=no --no-print-log --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} + COMMAND ${Python3_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} ) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}") From 01eaaf045d44718ea532d0e6c55c45f64282de56 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 14:04:57 +0200 Subject: [PATCH 140/994] Remove initialisation of tree in material manager This is now all contained in the ContainerTree code. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 155 +------------------------------ 1 file changed, 1 insertion(+), 154 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index c2b3f00210..26dba85b54 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -79,145 +79,7 @@ class MaterialManager(QObject): self._default_machine_definition_id = "fdmprinter" self._default_approximate_diameter_for_quality_search = "3" - # When a material gets added/imported, there can be more than one InstanceContainers. In those cases, we don't - # want to react on every container/metadata changed signal. The timer here is to buffer it a bit so we don't - # react too many time. - self._update_timer = QTimer(self) - self._update_timer.setInterval(300) - self._update_timer.setSingleShot(True) - self._update_timer.timeout.connect(self._updateMaps) - - container_registry = CuraContainerRegistry.getInstance() - container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) - container_registry.containerAdded.connect(self._onContainerMetadataChanged) - container_registry.containerRemoved.connect(self._onContainerMetadataChanged) - - self._favorites = set() # type: Set[str] - - def initialize(self) -> None: - # Find all materials and put them in a matrix for quick search. - container_registry = CuraContainerRegistry.getInstance() - material_metadatas = {metadata["id"]: metadata for metadata in - container_registry.findContainersMetadata(type = "material") if - metadata.get("GUID")} # type: Dict[str, Dict[str, Any]] - - self._material_group_map = dict() # type: Dict[str, MaterialGroup] - - # Map #1 - # root_material_id -> MaterialGroup - for material_id, material_metadata in material_metadatas.items(): - # We don't store empty material in the lookup tables - if material_id == "empty_material": - continue - - root_material_id = material_metadata.get("base_file", "") - if root_material_id not in material_metadatas: #Not a registered material profile. Don't store this in the look-up tables. - continue - if root_material_id not in self._material_group_map: - self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id])) - self._material_group_map[root_material_id].is_read_only = container_registry.isReadOnly(root_material_id) - group = self._material_group_map[root_material_id] - - # Store this material in the group of the appropriate root material. - if material_id != root_material_id: - new_node = MaterialNode(material_metadata) - group.derived_material_node_list.append(new_node) - - # Order this map alphabetically so it's easier to navigate in a debugger - self._material_group_map = OrderedDict(sorted(self._material_group_map.items(), key = lambda x: x[0])) - - # Map #1.5 - # GUID -> material group list - self._guid_material_groups_map = defaultdict(list) # type: Dict[str, List[MaterialGroup]] - for root_material_id, material_group in self._material_group_map.items(): - guid = material_group.root_material_node.getMetaDataEntry("GUID", "") - self._guid_material_groups_map[guid].append(material_group) - - # Map #2 - # Lookup table for material type -> fallback material metadata, only for read-only materials - grouped_by_type_dict = dict() # type: Dict[str, Any] - material_types_without_fallback = set() - for root_material_id, material_node in self._material_group_map.items(): - material_type = material_node.root_material_node.getMetaDataEntry("material", "") - if material_type not in grouped_by_type_dict: - grouped_by_type_dict[material_type] = {"generic": None, - "others": []} - material_types_without_fallback.add(material_type) - brand = material_node.root_material_node.getMetaDataEntry("brand", "") - if brand.lower() == "generic": - to_add = True - if material_type in grouped_by_type_dict: - diameter = material_node.root_material_node.getMetaDataEntry("approximate_diameter", "") - if diameter != self._default_approximate_diameter_for_quality_search: - to_add = False # don't add if it's not the default diameter - - if to_add: - # Checking this first allow us to differentiate between not read only materials: - # - if it's in the list, it means that is a new material without fallback - # - if it is not, then it is a custom material with a fallback material (parent) - if material_type in material_types_without_fallback: - grouped_by_type_dict[material_type] = material_node.root_material_node._metadata - material_types_without_fallback.remove(material_type) - - # Remove the materials that have no fallback materials - for material_type in material_types_without_fallback: - del grouped_by_type_dict[material_type] - self._fallback_materials_map = grouped_by_type_dict - - # Map #3 - # There can be multiple material profiles for the same material with different diameters, such as "generic_pla" - # and "generic_pla_175". This is inconvenient when we do material-specific quality lookup because a quality can - # be for either "generic_pla" or "generic_pla_175", but not both. This map helps to get the correct material ID - # for quality search. - self._material_diameter_map = defaultdict(dict) - self._diameter_material_map = dict() - - # Group the material IDs by the same name, material, brand, and color but with different diameters. - material_group_dict = dict() # type: Dict[Tuple[Any], Dict[str, str]] - keys_to_fetch = ("name", "material", "brand", "color") - for root_material_id, machine_node in self._material_group_map.items(): - root_material_metadata = machine_node.root_material_node._metadata - - key_data_list = [] # type: List[Any] - for key in keys_to_fetch: - key_data_list.append(machine_node.root_material_node.getMetaDataEntry(key)) - key_data = cast(Tuple[Any], tuple(key_data_list)) # type: Tuple[Any] - - # If the key_data doesn't exist, it doesn't matter if the material is read only... - if key_data not in material_group_dict: - material_group_dict[key_data] = dict() - else: - # ...but if key_data exists, we just overwrite it if the material is read only, otherwise we skip it - if not machine_node.is_read_only: - continue - approximate_diameter = machine_node.root_material_node.getMetaDataEntry("approximate_diameter", "") - material_group_dict[key_data][approximate_diameter] = machine_node.root_material_node.getMetaDataEntry("id", "") - - # Map [root_material_id][diameter] -> root_material_id for this diameter - for data_dict in material_group_dict.values(): - for root_material_id1 in data_dict.values(): - if root_material_id1 in self._material_diameter_map: - continue - diameter_map = data_dict - for root_material_id2 in data_dict.values(): - self._material_diameter_map[root_material_id2] = diameter_map - - default_root_material_id = data_dict.get(self._default_approximate_diameter_for_quality_search) - if default_root_material_id is None: - default_root_material_id = list(data_dict.values())[0] # no default diameter present, just take "the" only one - for root_material_id in data_dict.values(): - self._diameter_material_map[root_material_id] = default_root_material_id - - # Map #4 - # "machine" -> "nozzle name" -> "buildplate name" -> "root material ID" -> specific material InstanceContainer - self._diameter_machine_nozzle_buildplate_material_map = dict() # type: Dict[str, Dict[str, MaterialNode]] - for material_metadata in material_metadatas.values(): - self.__addMaterialMetadataIntoLookupTree(material_metadata) - - favorites = cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials") - for item in favorites.split(";"): - self._favorites.add(item) - + self._favorites = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) self.materialsUpdated.emit() def __addMaterialMetadataIntoLookupTree(self, material_metadata: Dict[str, Any]) -> None: @@ -285,21 +147,6 @@ class MaterialManager(QObject): current_node.material_map[root_material_id] = MaterialNode(material_metadata) - def _updateMaps(self): - Logger.log("i", "Updating material lookup data ...") - self.initialize() - - def _onContainerMetadataChanged(self, container): - self._onContainerChanged(container) - - def _onContainerChanged(self, container): - container_type = container.getMetaDataEntry("type") - if container_type != "material": - return - - # update the maps - self._update_timer.start() - def getMaterialGroup(self, root_material_id: str) -> Optional[MaterialGroup]: return self._material_group_map.get(root_material_id) From 8fb0a09460cd58624efe0087dc5735a6a2b5ea69 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 14:06:42 +0200 Subject: [PATCH 141/994] Remove unused imports Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 26dba85b54..b66dc8510f 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -1,10 +1,10 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from collections import defaultdict, OrderedDict +from collections import defaultdict import copy import uuid -from typing import Dict, Optional, TYPE_CHECKING, Any, Set, List, cast, Tuple +from typing import Dict, Optional, TYPE_CHECKING, Any, List, cast from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot From 93851a95d5fb5ba2fffc0ecefab5a81b65670074 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 15:04:06 +0200 Subject: [PATCH 142/994] Remove unused variable Contributes to issue CURA-6600. --- cura/Settings/CuraStackBuilder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 115daf8e3f..2ff7b3d4bd 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -27,7 +27,6 @@ class CuraStackBuilder: def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - variant_manager = application.getVariantManager() quality_manager = application.getQualityManager() registry = application.getContainerRegistry() From efaa96bca3325af20972fce3b9a4b195347303c2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 15:44:17 +0200 Subject: [PATCH 143/994] Fix building stack from freshly-loaded definition The definition may not have been added to the forest yet. Contributes to issue CURA-6600. --- cura/Settings/CuraStackBuilder.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 2ff7b3d4bd..69a95f68d5 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -9,7 +9,8 @@ from UM.Settings.Interfaces import DefinitionContainerInterface from UM.Settings.InstanceContainer import InstanceContainer from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.VariantType import VariantType +from cura.Machines.MachineNode import MachineNode +from cura.Machines.MaterialManager import MaterialManager from .GlobalStack import GlobalStack from .ExtruderStack import ExtruderStack @@ -100,11 +101,16 @@ class CuraStackBuilder: def createExtruderStackWithDefaultSetup(cls, global_stack: "GlobalStack", extruder_position: int) -> None: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - material_manager = application.getMaterialManager() + material_manager = MaterialManager.getInstance() registry = application.getContainerRegistry() + container_tree = ContainerTree.getInstance() # get variant container for extruders extruder_variant_container = application.empty_variant_container + # The container tree listens to the containerAdded signal to add this, but that signal is emitted with a delay which might not have passed yet. + # Therefore we must make sure that it's manually added here. + if global_stack.definition.getId() not in container_tree.machines: + container_tree.machines[global_stack.definition.getId()] = MachineNode(global_stack.definition.getId()) machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) extruder_variant_name = None @@ -118,7 +124,7 @@ class CuraStackBuilder: extruder_definition_id = extruder_definition_dict[str(extruder_position)] try: extruder_definition = registry.findDefinitionContainers(id = extruder_definition_id)[0] - except IndexError as e: + except IndexError: # It still needs to break, but we want to know what extruder ID made it break. msg = "Unable to find extruder definition with the id [%s]" % extruder_definition_id Logger.logException("e", msg) From 6a5f4254685107dcf8288264697035fcb2b212fb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 16:20:21 +0200 Subject: [PATCH 144/994] Fix running tests via CMake The Settings folder conflicts with the same folder in Uranium, so it couldn't find MockContainer from the Uranium version. Contributes to issue CURA-6600. --- tests/Settings/MockContainer.py | 121 ++++++++++++++++++++++++++++++++ tests/Settings/__init__.py | 0 tests/__init__.py | 0 3 files changed, 121 insertions(+) create mode 100644 tests/Settings/MockContainer.py create mode 100644 tests/Settings/__init__.py create mode 100644 tests/__init__.py diff --git a/tests/Settings/MockContainer.py b/tests/Settings/MockContainer.py new file mode 100644 index 0000000000..c85dbf42af --- /dev/null +++ b/tests/Settings/MockContainer.py @@ -0,0 +1,121 @@ +from typing import Optional + +from UM.Settings.Interfaces import ContainerInterface +import UM.PluginObject +from UM.Signal import Signal + + +## Fake container class to add to the container registry. +# +# This allows us to test the container registry without testing the container +# class. If something is wrong in the container class it won't influence this +# test. + +class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): + ## Initialise a new definition container. + # + # The container will have the specified ID and all metadata in the + # provided dictionary. + def __init__(self, metadata = None): + super().__init__() + if metadata is None: + self._metadata = {} + else: + self._metadata = metadata + self._plugin_id = "MockContainerPlugin" + + ## Gets the ID that was provided at initialisation. + # + # \return The ID of the container. + def getId(self): + return self._metadata["id"] + + ## Gets all metadata of this container. + # + # This returns the metadata dictionary that was provided in the + # constructor of this mock container. + # + # \return The metadata for this container. + def getMetaData(self): + return self._metadata + + ## Gets a metadata entry from the metadata dictionary. + # + # \param key The key of the metadata entry. + # \return The value of the metadata entry, or None if there is no such + # entry. + def getMetaDataEntry(self, entry, default = None): + if entry in self._metadata: + return self._metadata[entry] + return default + + ## Gets a human-readable name for this container. + # + # \return Always returns "MockContainer". + def getName(self): + return "MockContainer" + + ## Get whether the container item is stored on a read only location in the filesystem. + # + # \return Always returns False + def isReadOnly(self): + return False + + ## Mock get path + def getPath(self): + return "/path/to/the/light/side" + + ## Mock set path + def setPath(self, path): + pass + + def getAllKeys(self): + pass + + def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): + pass + + def getProperty(self, key, property_name, context=None): + if key in self.items: + return self.items[key] + + return None + + ## Get the value of a container item. + # + # Since this mock container cannot contain any items, it always returns + # None. + # + # \return Always returns None. + def getValue(self, key): + pass + + ## Get whether the container item has a specific property. + # + # This method is not implemented in the mock container. + def hasProperty(self, key, property_name): + return key in self.items + + ## Serializes the container to a string representation. + # + # This method is not implemented in the mock container. + def serialize(self, ignored_metadata_keys = None): + raise NotImplementedError() + + ## Deserializes the container from a string representation. + # + # This method is not implemented in the mock container. + def deserialize(self, serialized, file_name: Optional[str] = None): + raise NotImplementedError() + + @classmethod + def getConfigurationTypeFromSerialized(cls, serialized: str): + raise NotImplementedError() + + @classmethod + def getVersionFromSerialized(cls, serialized): + raise NotImplementedError() + + metaDataChanged = Signal() + propertyChanged = Signal() + containersChanged = Signal() diff --git a/tests/Settings/__init__.py b/tests/Settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 From c218b7ac56e88606bd93adfe3a8fa3204a70ee99 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 13 Aug 2019 16:22:33 +0200 Subject: [PATCH 145/994] Fix the tests for materialnode CURA-6600 --- tests/Machines/TestMaterialNode.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index e288a5310d..099be2b891 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -3,15 +3,15 @@ import pytest from cura.Machines.MaterialNode import MaterialNode -instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"id": "quality_1"}]}, - "machine_1": {"variant_1": {"material_1": [{"id": "quality_2"}, {"id": "quality_3"}]}}} +instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"id": "quality_1", "material": "material_1"}]}, + "machine_1": {"variant_1": {"material_1": [{"id": "quality_2", "material": "material_1"}, {"id": "quality_3","material": "material_1"}]}}} quality_metadata_machine_quality_test_data = [({"type": "Not a quality"}, ["quality_2", "quality_3"]), # Wrong type ({"type": "quality", "definition": "machine_2"}, ["quality_2", "quality_3"]), # Wrong defintion ({"type": "quality", "definition": "machine_1", "variant": "variant_2"}, ["quality_2", "quality_3"]), # Wrong variant ({"type": "quality", "definition": "machine_1", "variant": "variant_1", "material": "material_2"}, ["quality_2", "quality_3"]), # wrong material - ({"type": "quality", "definition": "machine_1", "variant": "variant_1", "material": "material_1"}, ["quality_2", "quality_3", "quality_4"]), + ] quality_metadata_no_machine_quality =[({"type": "Not a quality"}, ["quality_1"]), # Wrong type @@ -38,11 +38,20 @@ def createMockedInstanceContainer(container_id): def getInstanceContainerSideEffect(*args, **kwargs): variant = kwargs.get("variant") definition = kwargs.get("definition") - if variant is not None: + type = kwargs.get("type") + material = kwargs.get("material") + if material is not None and variant is not None: definition_dict = instance_container_metadata_dict.get(definition) variant_dict = definition_dict.get(variant) - material_dict = variant_dict.get(kwargs.get("material")) + material_dict = variant_dict.get(material) return material_dict + if type == "quality": + if variant is None: + return instance_container_metadata_dict.get(definition).get("no_variant") + else: + return instance_container_metadata_dict.get(definition).get(variant).get("material_1") + if definition is None: + return [{"id": "material_1", "material": "material_1"}] return instance_container_metadata_dict.get(definition).get("no_variant") From 7f84145c9acf465e7e2162d069520bc870dca108 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 16:45:13 +0200 Subject: [PATCH 146/994] Rewrite MaterialManager.getAvailableMaterials to use ContainerTree Makes it a lot simpler since the nodes in the tree already encoded the fallback mechanism. However I'm dropping support for filtering by diameter here, since the diameter is not known in the ContainerTree. I'm also dropping support for build plate materials for simplicity and to stay lean. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 63 ++++---------------------------- 1 file changed, 7 insertions(+), 56 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index b66dc8510f..4f3583c090 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -14,6 +14,7 @@ from UM.Logger import Logger from UM.Settings.SettingFunction import SettingFunction from UM.Util import parseBool import cura.CuraApplication #Imported like this to prevent circular imports. +from cura.Machines.ContainerTree import ContainerTree from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from .MaterialNode import MaterialNode @@ -163,73 +164,23 @@ class MaterialManager(QObject): def getAllMaterialGroups(self) -> Dict[str, "MaterialGroup"]: return self._material_group_map - # - # Return a dict with all root material IDs (k) and ContainerNodes (v) that's suitable for the given setup. - # - def getAvailableMaterials(self, machine_definition: "DefinitionContainer", nozzle_name: Optional[str], - buildplate_name: Optional[str], diameter: float) -> Dict[str, MaterialNode]: - # round the diameter to get the approximate diameter - rounded_diameter = str(round(diameter)) - if rounded_diameter not in self._diameter_machine_nozzle_buildplate_material_map: - Logger.log("i", "Cannot find materials with diameter [%s] (rounded to [%s])", diameter, rounded_diameter) - return dict() - - machine_definition_id = machine_definition.getId() - - # If there are nozzle-and-or-buildplate materials, get the nozzle-and-or-buildplate material - machine_nozzle_buildplate_material_map = self._diameter_machine_nozzle_buildplate_material_map[rounded_diameter] - machine_node = machine_nozzle_buildplate_material_map.get(machine_definition_id) - default_machine_node = machine_nozzle_buildplate_material_map.get(self._default_machine_definition_id) - nozzle_node = None - buildplate_node = None - if nozzle_name is not None and machine_node is not None: - nozzle_node = machine_node.getChildNode(nozzle_name) - # Get buildplate node if possible - if nozzle_node is not None and buildplate_name is not None: - buildplate_node = nozzle_node.getChildNode(buildplate_name) - - nodes_to_check = [buildplate_node, nozzle_node, machine_node, default_machine_node] - # Fallback mechanism of finding materials: - # 1. buildplate-specific material - # 2. nozzle-specific material - # 3. machine-specific material - # 4. generic material (for fdmprinter) - machine_exclude_materials = machine_definition.getMetaDataEntry("exclude_materials", []) - - material_id_metadata_dict = dict() # type: Dict[str, MaterialNode] - excluded_materials = set() - for current_node in nodes_to_check: - if current_node is None: - continue - - # Only exclude the materials that are explicitly specified in the "exclude_materials" field. - # Do not exclude other materials that are of the same type. - for material_id, node in current_node.material_map.items(): - if material_id in machine_exclude_materials: - excluded_materials.add(material_id) - continue - - if material_id not in material_id_metadata_dict: - material_id_metadata_dict[material_id] = node - - if excluded_materials: - Logger.log("d", "Exclude materials {excluded_materials} for machine {machine_definition_id}".format(excluded_materials = ", ".join(excluded_materials), machine_definition_id = machine_definition_id)) - - return material_id_metadata_dict + ## Gives a dictionary of all root material IDs and their associated + # MaterialNodes from the ContainerTree that are available for the given + # printer and variant. + def getAvailableMaterials(self, definition_id: str, nozzle_name: Optional[str]) -> Dict[str, MaterialNode]: + return ContainerTree.getInstance().machines[definition_id].variants.get(nozzle_name, "empty_variant").materials # # A convenience function to get available materials for the given machine with the extruder position. # def getAvailableMaterialsForMachineExtruder(self, machine: "GlobalStack", extruder_stack: "ExtruderStack") -> Optional[Dict[str, MaterialNode]]: - buildplate_name = machine.getBuildplateName() nozzle_name = None if extruder_stack.variant.getId() != "empty_variant": nozzle_name = extruder_stack.variant.getName() - diameter = extruder_stack.getApproximateMaterialDiameter() # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. - return self.getAvailableMaterials(machine.definition, nozzle_name, buildplate_name, diameter) + return self.getAvailableMaterials(machine.definition.getId(), nozzle_name) # # Gets MaterialNode for the given extruder and machine with the given material name. From 5738af4bb8e5bb92c43b9cfe5af9988d9dcbe833 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 16:51:33 +0200 Subject: [PATCH 147/994] No longer use deprecated MaterialManager when asking for available materials Use the ContainerTree structure instead. That's what it's for. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 2 +- cura/Settings/MachineManager.py | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 4f3583c090..8f363817f4 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -168,7 +168,7 @@ class MaterialManager(QObject): # MaterialNodes from the ContainerTree that are available for the given # printer and variant. def getAvailableMaterials(self, definition_id: str, nozzle_name: Optional[str]) -> Dict[str, MaterialNode]: - return ContainerTree.getInstance().machines[definition_id].variants.get(nozzle_name, "empty_variant").materials + return ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials # # A convenience function to get available materials for the given machine with the extruder position. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5c4ff603c4..392190507b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -22,6 +22,7 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.Machines.MaterialManager import MaterialManager @@ -1312,6 +1313,8 @@ class MachineManager(QObject): current_quality_type, quality_type) self._setQualityGroup(candidate_quality_groups[quality_type], empty_quality_changes = True) + ## Update the material profile in the current stacks when the variant is + # changed. def updateMaterialWithVariant(self, position: Optional[str]) -> None: if self._global_container_stack is None: return @@ -1320,10 +1323,6 @@ class MachineManager(QObject): else: position_list = [position] - buildplate_name = None - if self._global_container_stack.variant.getId() != "empty_variant": - buildplate_name = self._global_container_stack.variant.getName() - for position_item in position_list: extruder = self._global_container_stack.extruders[position_item] @@ -1332,12 +1331,7 @@ class MachineManager(QObject): if extruder.variant.getId() != empty_variant_container.getId(): current_nozzle_name = extruder.variant.getMetaDataEntry("name") - material_diameter = extruder.getCompatibleMaterialDiameter() - candidate_materials = MaterialManager.getInstance().getAvailableMaterials( - self._global_container_stack.definition, - current_nozzle_name, - buildplate_name, - material_diameter) + candidate_materials = ContainerTree.getInstance().machines[self._global_container_stack.definition.getId()].variants[current_nozzle_name].materials if not candidate_materials: self._setMaterial(position_item, container_node = None) From 54b46abd0ff82a9a566715f7203c9dfbc3d55258 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 17:11:49 +0200 Subject: [PATCH 148/994] Use specific classes instead of ContainerNode superclass Also update the usage of these nodes because the getContainer() function is deprecated. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 392190507b..b0ab349d86 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -45,9 +45,10 @@ from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.CuraApplication import CuraApplication from cura.Settings.CuraContainerStack import CuraContainerStack - from cura.Machines.ContainerNode import ContainerNode + from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityGroup import QualityGroup + from cura.Machines.VariantNode import VariantNode class MachineManager(QObject): @@ -1235,10 +1236,10 @@ class MachineManager(QObject): self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() - def _setVariantNode(self, position: str, container_node: "ContainerNode") -> None: - if container_node.getContainer() is None or self._global_container_stack is None: + def _setVariantNode(self, position: str, variant_node: "VariantNode") -> None: + if self._global_container_stack is None: return - self._global_container_stack.extruders[position].variant = container_node.getContainer() + self._global_container_stack.extruders[position].variant = CuraContainerRegistry.getInstance().findContainers(id = variant_node.container_id) self.activeVariantChanged.emit() def _setGlobalVariant(self, container_node: "ContainerNode") -> None: @@ -1248,12 +1249,12 @@ class MachineManager(QObject): if not self._global_container_stack.variant: self._global_container_stack.variant = self._application.empty_variant_container - def _setMaterial(self, position: str, container_node: Optional["ContainerNode"] = None) -> None: + def _setMaterial(self, position: str, material_node: Optional["MaterialNode"] = None) -> None: if self._global_container_stack is None: return - if container_node and container_node.getContainer(): - self._global_container_stack.extruders[position].material = container_node.getContainer() - root_material_id = container_node.getMetaDataEntry("base_file", None) + if material_node: + self._global_container_stack.extruders[position].material = CuraContainerRegistry.getInstance().findContainers(id = material_node.container_id) + root_material_id = material_node.getMetaDataEntry("base_file", None) else: self._global_container_stack.extruders[position].material = empty_material_container root_material_id = None @@ -1521,11 +1522,11 @@ class MachineManager(QObject): self.setVariant(position, variant_node) @pyqtSlot(str, "QVariant") - def setVariant(self, position: str, container_node: "ContainerNode") -> None: + def setVariant(self, position: str, variant_node: "VariantNode") -> None: position = str(position) self.blurSettings.emit() with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): - self._setVariantNode(position, container_node) + self._setVariantNode(position, variant_node) self.updateMaterialWithVariant(position) self._updateQualityWithMaterial() From 7d1f8e981b20569a1036095f2cb00e62679e205d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 17:18:18 +0200 Subject: [PATCH 149/994] Fix models using new MaterialNode class The new one doesn't have getMetadata. Maybe we should allow it to have that actually. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 10 +++++----- cura/Machines/Models/FavoriteMaterialsModel.py | 6 ++---- cura/Machines/Models/GenericMaterialsModel.py | 8 +++----- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index e936877923..cd8fc70dbd 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -1,18 +1,18 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from typing import Optional, Dict, Set from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty from UM.Qt.ListModel import ListModel +from cura.Machines.MaterialNode import MaterialNode +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry ## This is the base model class for GenericMaterialsModel and MaterialBrandsModel. # Those 2 models are used by the material drop down menu to show generic materials and branded materials separately. # The extruder position defined here is being used to bound a menu to the correct extruder. This is used in the top # bar menu "Settings" -> "Extruder nr" -> "Material" -> this menu -from cura.Machines.MaterialNode import MaterialNode - - class BaseMaterialsModel(ListModel): extruderPositionChanged = pyqtSignal() @@ -128,7 +128,7 @@ class BaseMaterialsModel(ListModel): ## This is another convenience function which is shared by all material # models so it's put here to avoid having so much duplicated code. def _createMaterialItem(self, root_material_id, container_node): - metadata = container_node.getMetadata() + metadata = CuraContainerRegistry.getInstance().findContainersMetadata(id = container_node.container_id)[0] item = { "root_material_id": root_material_id, "id": metadata["id"], diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index 98a2a01597..dda06a953a 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel @@ -19,10 +19,8 @@ class FavoriteMaterialsModel(BaseMaterialsModel): item_list = [] for root_material_id, container_node in self._available_materials.items(): - metadata = container_node.getMetadata() - # Do not include the materials from a to-be-removed package - if bool(metadata.get("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Only add results for favorite materials diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index e81a73de24..8a03dcfdeb 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel @@ -19,14 +19,12 @@ class GenericMaterialsModel(BaseMaterialsModel): item_list = [] for root_material_id, container_node in self._available_materials.items(): - metadata = container_node.getMetadata() - # Do not include the materials from a to-be-removed package - if bool(metadata.get("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Only add results for generic materials - if metadata["brand"].lower() != "generic": + if container_node.getMetaDataEntry("brand").lower() != "generic": continue item = self._createMaterialItem(root_material_id, container_node) From 47fe4b4c90da94deae6d69d8fe86502708e086bd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 13 Aug 2019 17:20:38 +0200 Subject: [PATCH 150/994] Re-add getMetadata() We need to deprecate it to not break functionality of old plug-ins and such. Contributes to issue CURA-6600. --- cura/Machines/ContainerNode.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 8fd381a7fb..32ebe203a3 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -23,6 +23,12 @@ class ContainerNode: self._container = None # type: Optional[InstanceContainer] self.children_map = {} # type: Dict[str, ContainerNode] # Mapping from container ID to container node. + ## Gets the metadata of the container that this node represents. + # \return The metadata of the container in this node. + @deprecated("Get the metadata from the container with the ID of this node yourself.", "4.3") + def getMetadata(self): + return ContainerRegistry.getInstance().findContainersMetadata(id = self.container_id)[0] + ## Get an entry from the metadata of the container that this node contains. # \param entry The metadata entry key to return. # \param default If the metadata is not present or the container is not From 6a3a23a7254ee5c69d23cace4bce71cc47eb564e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Aug 2019 13:11:45 +0200 Subject: [PATCH 151/994] Add time logging about how long it took to construct the container tree CURA-6600 --- cura/Machines/ContainerTree.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 129bcba5e8..2f641973ac 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -8,7 +8,7 @@ from UM.Settings.Interfaces import ContainerInterface from cura.Machines.MachineNode import MachineNode from typing import Dict - +import time ## This class contains a look-up tree for which containers are available at # which stages of configuration. # @@ -32,12 +32,15 @@ class ContainerTree: ## Builds the initial container tree. def _loadAll(self): Logger.log("i", "Building container tree.") + start_time = time.time() all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: definition_id = stack.definition.getId() if definition_id not in self.machines: self.machines[definition_id] = MachineNode(definition_id) + Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) + ## When a printer gets added, we need to build up the tree for that container. def _machineAdded(self, definition_container: ContainerInterface): if not isinstance(definition_container, DefinitionContainer): From c0f70c447e3bbda10437552dc1e2f725e32f0f10 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Aug 2019 13:32:42 +0200 Subject: [PATCH 152/994] Ensure that the materials are loaded again CURA-6600 --- cura/Machines/MaterialManager.py | 43 +++++++++----------------------- cura/Settings/MachineManager.py | 2 +- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 8f363817f4..69c014e8ef 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -190,41 +190,22 @@ class MaterialManager(QObject): # def getMaterialNode(self, machine_definition_id: str, nozzle_name: Optional[str], buildplate_name: Optional[str], diameter: float, root_material_id: str) -> Optional["MaterialNode"]: - # round the diameter to get the approximate diameter - rounded_diameter = str(round(diameter)) - if rounded_diameter not in self._diameter_machine_nozzle_buildplate_material_map: - Logger.log("i", "Cannot find materials with diameter [%s] (rounded to [%s]) for root material id [%s]", - diameter, rounded_diameter, root_material_id) + container_tree = ContainerTree.getInstance() + machine_node = container_tree.machines.get(machine_definition_id) + if machine_node is None: + Logger.log("w", "Could not find machine with definition %s in the container tree", machine_definition_id) return None - # If there are nozzle materials, get the nozzle-specific material - machine_nozzle_buildplate_material_map = self._diameter_machine_nozzle_buildplate_material_map[rounded_diameter] # type: Dict[str, MaterialNode] - machine_node = machine_nozzle_buildplate_material_map.get(machine_definition_id) - nozzle_node = None - buildplate_node = None + variant_node = machine_node.variants.get(nozzle_name) + if variant_node is None: + Logger.log("w", "Could not find variant %s for machine with definition %s in the container tree", nozzle_name, machine_definition_id ) + return None - # Fallback for "fdmprinter" if the machine-specific materials cannot be found - if machine_node is None: - machine_node = machine_nozzle_buildplate_material_map.get(self._default_machine_definition_id) - if machine_node is not None and nozzle_name is not None: - nozzle_node = machine_node.getChildNode(nozzle_name) - if nozzle_node is not None and buildplate_name is not None: - buildplate_node = nozzle_node.getChildNode(buildplate_name) + material_node = variant_node.materials.get(root_material_id) - # Fallback mechanism of finding materials: - # 1. buildplate-specific material - # 2. nozzle-specific material - # 3. machine-specific material - # 4. generic material (for fdmprinter) - nodes_to_check = [buildplate_node, nozzle_node, machine_node, - machine_nozzle_buildplate_material_map.get(self._default_machine_definition_id)] - - material_node = None - for node in nodes_to_check: - if node is not None: - material_node = node.material_map.get(root_material_id) - if material_node: - break + if material_node is None: + Logger.log("w", "Could not find material %s for machine with definition %s and variant %s in the container tree", root_material_id, machine_definition_id, nozzle_name) + return None return material_node diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b0ab349d86..c454b59a00 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1253,7 +1253,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return if material_node: - self._global_container_stack.extruders[position].material = CuraContainerRegistry.getInstance().findContainers(id = material_node.container_id) + self._global_container_stack.extruders[position].material = CuraContainerRegistry.getInstance().findContainers(id = material_node.container_id)[0] root_material_id = material_node.getMetaDataEntry("base_file", None) else: self._global_container_stack.extruders[position].material = empty_material_container From 76729360e1d0c9b572fe17c7eaca938533fd7321 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Aug 2019 13:33:17 +0200 Subject: [PATCH 153/994] Remove unused code CURA-6600 --- cura/Machines/MaterialManager.py | 65 -------------------------------- 1 file changed, 65 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 69c014e8ef..c63c04e195 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -83,71 +83,6 @@ class MaterialManager(QObject): self._favorites = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) self.materialsUpdated.emit() - def __addMaterialMetadataIntoLookupTree(self, material_metadata: Dict[str, Any]) -> None: - material_id = material_metadata["id"] - - # We don't store empty material in the lookup tables - if material_id == "empty_material": - return - - root_material_id = material_metadata["base_file"] - definition = material_metadata["definition"] - approximate_diameter = str(material_metadata["approximate_diameter"]) - - if approximate_diameter not in self._diameter_machine_nozzle_buildplate_material_map: - self._diameter_machine_nozzle_buildplate_material_map[approximate_diameter] = {} - - machine_nozzle_buildplate_material_map = self._diameter_machine_nozzle_buildplate_material_map[ - approximate_diameter] - if definition not in machine_nozzle_buildplate_material_map: - machine_nozzle_buildplate_material_map[definition] = MaterialNode() - - # This is a list of information regarding the intermediate nodes: - # nozzle -> buildplate - nozzle_name = material_metadata.get("variant_name") - buildplate_name = material_metadata.get("buildplate_name") - intermediate_node_info_list = [(nozzle_name, VariantType.NOZZLE), - (buildplate_name, VariantType.BUILD_PLATE), - ] - - variant_manager = cura.CuraApplication.CuraApplication.getInstance().getVariantManager() - - machine_node = machine_nozzle_buildplate_material_map[definition] - current_node = machine_node - current_intermediate_node_info_idx = 0 - error_message = None # type: Optional[str] - while current_intermediate_node_info_idx < len(intermediate_node_info_list): - variant_name, variant_type = intermediate_node_info_list[current_intermediate_node_info_idx] - if variant_name is not None: - # The new material has a specific variant, so it needs to be added to that specific branch in the tree. - variant = variant_manager.getVariantNode(definition, variant_name, variant_type) - if variant is None: - error_message = "Material {id} contains a variant {name} that does not exist.".format( - id = material_metadata["id"], name = variant_name) - break - - # Update the current node to advance to a more specific branch - if variant_name not in current_node.children_map: - current_node.children_map[variant_name] = MaterialNode() - current_node = current_node.children_map[variant_name] - - current_intermediate_node_info_idx += 1 - - if error_message is not None: - Logger.log("e", "%s It will not be added into the material lookup tree.", error_message) - CuraContainerRegistry.getInstance().addWrongContainerId(material_metadata["id"]) - return - - # Add the material to the current tree node, which is the deepest (the most specific) branch we can find. - # Sanity check: Make sure that there is no duplicated materials. - if root_material_id in current_node.material_map: - Logger.log("e", "Duplicated material [%s] with root ID [%s]. It has already been added.", - material_id, root_material_id) - ConfigurationErrorMessage.getInstance().addFaultyContainers(root_material_id) - return - - current_node.material_map[root_material_id] = MaterialNode(material_metadata) - def getMaterialGroup(self, root_material_id: str) -> Optional[MaterialGroup]: return self._material_group_map.get(root_material_id) From 7fb9642e45827d42526ce468c53c0bc6ad69d26f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 15 Aug 2019 13:40:08 +0200 Subject: [PATCH 154/994] Replace deprecated .getContainer() calls with .container part of CURA-6600 --- cura/Machines/MaterialManager.py | 6 ++-- .../QualityProfilesDropDownMenuModel.py | 2 +- cura/Machines/Models/QualitySettingsModel.py | 4 +-- cura/Machines/QualityGroup.py | 2 +- cura/Machines/QualityManager.py | 4 +-- cura/Settings/ContainerManager.py | 6 ++-- cura/Settings/CuraStackBuilder.py | 12 +++---- cura/Settings/MachineManager.py | 34 +++++++++---------- plugins/3MFReader/ThreeMFWorkspaceReader.py | 16 ++++----- plugins/UFPWriter/UFPWriter.py | 2 +- .../ClusterPrinterConfigurationMaterial.py | 2 +- .../XmlMaterialProfile/XmlMaterialProfile.py | 4 +-- tests/Settings/TestCuraStackBuilder.py | 4 +-- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 8f363817f4..350947ed42 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -390,7 +390,7 @@ class MaterialManager(QObject): material_group = self.getMaterialGroup(root_material_id) if material_group: - container = material_group.root_material_node.getContainer() + container = material_group.root_material_node.container if container: container.setName(name) @@ -416,7 +416,7 @@ class MaterialManager(QObject): Logger.log("i", "Unable to duplicate the material with id %s, because it doesn't exist.", root_material_id) return None - base_container = material_group.root_material_node.getContainer() + base_container = material_group.root_material_node.container if not base_container: return None @@ -438,7 +438,7 @@ class MaterialManager(QObject): # Clone all of them. for node in material_group.derived_material_node_list: - container_to_copy = node.getContainer() + container_to_copy = node.container if not container_to_copy: continue # Create unique IDs for every clone. diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 8d6c024e8c..5113bd99b5 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -106,7 +106,7 @@ class QualityProfilesDropDownMenuModel(ListModel): # Get layer_height from the quality profile for the GlobalStack if quality_group.node_for_global is None: return float(default_layer_height) - container = quality_group.node_for_global.getContainer() + container = quality_group.node_for_global.container layer_height = default_layer_height if container and container.hasProperty("layer_height", "value"): diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 88005e69ca..796d11fb87 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -103,8 +103,8 @@ class QualitySettingsModel(ListModel): quality_changes_node = quality_changes_group.node_for_global else: quality_changes_node = quality_changes_group.nodes_for_extruders.get(str(self._selected_position)) - if quality_changes_node is not None and quality_changes_node.getContainer() is not None: # it can be None if number of extruders are changed during runtime - quality_containers.insert(0, quality_changes_node.getContainer()) + if quality_changes_node is not None and quality_changes_node.container is not None: # it can be None if number of extruders are changed during runtime + quality_containers.insert(0, quality_changes_node.container) settings_keys.update(quality_changes_group.getAllKeys()) # We iterate over all definitions instead of settings in a quality/qualtiy_changes group is because in the GUI, diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index f5bcbb0de8..4eb68a04af 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -43,7 +43,7 @@ class QualityGroup(QObject): for node in [self.node_for_global] + list(self.nodes_for_extruders.values()): if node is None: continue - container = node.getContainer() + container = node.container if container: result.update(container.getAllKeys()) return result diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index b141434437..3717f32633 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -204,7 +204,7 @@ class QualityManager(QObject): new_name = self._container_registry.uniqueName(new_name) for node in quality_changes_group.getAllNodes(): - container = node.getContainer() + container = node.container if container: container.setName(new_name) @@ -237,7 +237,7 @@ class QualityManager(QObject): else: new_name = self._container_registry.uniqueName(quality_changes_name) for node in quality_changes_group.getAllNodes(): - container = node.getContainer() + container = node.container if not container: continue new_id = self._container_registry.uniqueName(container.getId()) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index bab8efb775..1438faee96 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -112,7 +112,7 @@ class ContainerManager(QObject): entry_name = root_name entry_value = root - container = material_group.root_material_node.getContainer() + container = material_group.root_material_node.container if container is not None: container.setMetaDataEntry(entry_name, entry_value) if sub_item_changed: #If it was only a sub-item that has changed then the setMetaDataEntry won't correctly notice that something changed, and we must manually signal that the metadata changed. @@ -357,7 +357,7 @@ class ContainerManager(QObject): # Update the GUID # NOTE: We only need to set the root material container because XmlMaterialProfile.setMetaDataEntry() will # take care of the derived containers too - container = material_group.root_material_node.getContainer() + container = material_group.root_material_node.container if container is not None: container.setMetaDataEntry("GUID", new_guid) @@ -436,7 +436,7 @@ class ContainerManager(QObject): if not path: return - container_list = [n.getContainer() for n in quality_changes_group.getAllNodes() if n.getContainer() is not None] + container_list = [n.container for n in quality_changes_group.getAllNodes() if n.container is not None] cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().exportQualityProfile(container_list, path, file_type) __instance = None # type: ContainerManager diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 69a95f68d5..e5bce516bf 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -78,12 +78,12 @@ class CuraStackBuilder: preferred_quality_type = next(iter(quality_group_dict)) quality_group = quality_group_dict.get(preferred_quality_type) - new_global_stack.quality = quality_group.node_for_global.getContainer() + new_global_stack.quality = quality_group.node_for_global.container if not new_global_stack.quality: new_global_stack.quality = application.empty_quality_container for position, extruder_stack in new_global_stack.extruders.items(): - if position in quality_group.nodes_for_extruders and quality_group.nodes_for_extruders[position].getContainer(): - extruder_stack.quality = quality_group.nodes_for_extruders[position].getContainer() + if position in quality_group.nodes_for_extruders and quality_group.nodes_for_extruders[position].container: + extruder_stack.quality = quality_group.nodes_for_extruders[position].container else: extruder_stack.quality = application.empty_quality_container @@ -115,7 +115,7 @@ class CuraStackBuilder: extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) extruder_variant_name = None if extruder_variant_node is not None: - extruder_variant_container = extruder_variant_node.getContainer() + extruder_variant_container = extruder_variant_node.container if not extruder_variant_container: extruder_variant_container = application.empty_variant_container extruder_variant_name = extruder_variant_container.getName() @@ -134,8 +134,8 @@ class CuraStackBuilder: material_container = application.empty_material_container material_node = material_manager.getDefaultMaterial(global_stack, str(extruder_position), extruder_variant_name, extruder_definition = extruder_definition) - if material_node and material_node.getContainer(): - material_container = material_node.getContainer() + if material_node and material_node.container: + material_container = material_node.container new_extruder_id = registry.uniqueName(extruder_definition_id) new_extruder = cls.createExtruderStack( diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b0ab349d86..a67dc4d716 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1160,10 +1160,10 @@ class MachineManager(QObject): self._setEmptyQuality() return - if quality_group.node_for_global is None or quality_group.node_for_global.getContainer() is None: + if quality_group.node_for_global is None or quality_group.node_for_global.container is None: return for node in quality_group.nodes_for_extruders.values(): - if node.getContainer() is None: + if node.container is None: return self._current_quality_group = quality_group @@ -1171,13 +1171,13 @@ class MachineManager(QObject): self._current_quality_changes_group = None # Set quality and quality_changes for the GlobalStack - self._global_container_stack.quality = quality_group.node_for_global.getContainer() + self._global_container_stack.quality = quality_group.node_for_global.container if empty_quality_changes: self._global_container_stack.qualityChanges = empty_quality_changes_container # Set quality and quality_changes for each ExtruderStack for position, node in quality_group.nodes_for_extruders.items(): - self._global_container_stack.extruders[str(position)].quality = node.getContainer() + self._global_container_stack.extruders[str(position)].quality = node.container if empty_quality_changes: self._global_container_stack.extruders[str(position)].qualityChanges = empty_quality_changes_container @@ -1186,7 +1186,7 @@ class MachineManager(QObject): def _fixQualityChangesGroupToNotSupported(self, quality_changes_group: "QualityChangesGroup") -> None: nodes = [quality_changes_group.node_for_global] + list(quality_changes_group.nodes_for_extruders.values()) - containers = [n.getContainer() for n in nodes if n is not None] + containers = [n.container for n in nodes if n is not None] for container in containers: if container: container.setMetaDataEntry("quality_type", "not_supported") @@ -1207,10 +1207,10 @@ class MachineManager(QObject): quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container # type: Optional[InstanceContainer] - if quality_changes_group.node_for_global and quality_changes_group.node_for_global.getContainer(): - quality_changes_container = cast(InstanceContainer, quality_changes_group.node_for_global.getContainer()) - if quality_group is not None and quality_group.node_for_global and quality_group.node_for_global.getContainer(): - quality_container = quality_group.node_for_global.getContainer() + if quality_changes_group.node_for_global and quality_changes_group.node_for_global.container: + quality_changes_container = cast(InstanceContainer, quality_changes_group.node_for_global.container) + if quality_group is not None and quality_group.node_for_global and quality_group.node_for_global.container: + quality_container = quality_group.node_for_global.container self._global_container_stack.quality = quality_container self._global_container_stack.qualityChanges = quality_changes_container @@ -1223,10 +1223,10 @@ class MachineManager(QObject): quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container - if quality_changes_node and quality_changes_node.getContainer(): - quality_changes_container = cast(InstanceContainer, quality_changes_node.getContainer()) - if quality_node and quality_node.getContainer(): - quality_container = quality_node.getContainer() + if quality_changes_node and quality_changes_node.container: + quality_changes_container = cast(InstanceContainer, quality_changes_node.container) + if quality_node and quality_node.container: + quality_container = quality_node.container extruder.quality = quality_container extruder.qualityChanges = quality_changes_container @@ -1245,7 +1245,7 @@ class MachineManager(QObject): def _setGlobalVariant(self, container_node: "ContainerNode") -> None: if self._global_container_stack is None: return - self._global_container_stack.variant = container_node.getContainer() + self._global_container_stack.variant = container_node.container if not self._global_container_stack.variant: self._global_container_stack.variant = self._application.empty_variant_container @@ -1501,7 +1501,7 @@ class MachineManager(QObject): @pyqtSlot(str, "QVariant") def setMaterial(self, position: str, container_node, global_stack: Optional["GlobalStack"] = None) -> None: if global_stack is not None and global_stack != self._global_container_stack: - global_stack.extruders[position].material = container_node.getContainer() + global_stack.extruders[position].material = container_node.container return position = str(position) self.blurSettings.emit() @@ -1555,11 +1555,11 @@ class MachineManager(QObject): Logger.log("e", "Could not set quality group [%s] because it has no node_for_global", str(quality_group)) return # This is not changing the quality for the active machine !!!!!!!! - global_stack.quality = quality_group.node_for_global.getContainer() + global_stack.quality = quality_group.node_for_global.container for extruder_nr, extruder_stack in global_stack.extruders.items(): quality_container = empty_quality_container if extruder_nr in quality_group.nodes_for_extruders: - container = quality_group.nodes_for_extruders[extruder_nr].getContainer() + container = quality_group.nodes_for_extruders[extruder_nr].container quality_container = container if container is not None else quality_container extruder_stack.quality = quality_container return diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index ed758abd2d..0e1b0d73a7 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -901,8 +901,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): variant_type = VariantType.BUILD_PLATE node = variant_manager.getVariantNode(global_stack.definition.getId(), variant_name, variant_type) - if node is not None and node.getContainer() is not None: - global_stack.variant = node.getContainer() + if node is not None and node.container is not None: + global_stack.variant = node.container for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: @@ -911,8 +911,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if extruder_info.variant_info is None: # If there is no variant_info, try to use the default variant. Otherwise, leave it be. node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE, global_stack) - if node is not None and node.getContainer() is not None: - extruder_stack.variant = node.getContainer() + if node is not None and node.container is not None: + extruder_stack.variant = node.container continue parser = extruder_info.variant_info.parser @@ -920,8 +920,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): variant_type = VariantType.NOZZLE node = variant_manager.getVariantNode(global_stack.definition.getId(), variant_name, variant_type) - if node is not None and node.getContainer() is not None: - extruder_stack.variant = node.getContainer() + if node is not None and node.container is not None: + extruder_stack.variant = node.container def _applyMaterials(self, global_stack, extruder_stack_dict): application = CuraApplication.getInstance() @@ -947,8 +947,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): machine_material_diameter, root_material_id) - if material_node is not None and material_node.getContainer() is not None: - extruder_stack.material = material_node.getContainer() # type: InstanceContainer + if material_node is not None and material_node.container is not None: + extruder_stack.material = material_node.container # type: InstanceContainer def _applyChangesToMachine(self, global_stack, extruder_stack_dict): # Clear all first diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 2aece1092a..1e6b2e80cc 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -112,7 +112,7 @@ class UFPWriter(MeshWriter): Logger.log("e", "Cannot find material container with root id [%s]", material_root_id) return False - material_container = material_group.root_material_node.getContainer() + material_container = material_group.root_material_node.container try: serialized_material = material_container.serialize() except NotImplementedError: diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index 378a885a3b..aea244b31d 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -41,7 +41,7 @@ class ClusterPrinterConfigurationMaterial(BaseModel): material_group = non_read_only_material_group_list[0] if material_group: - container = material_group.root_material_node.getContainer() + container = material_group.root_material_node.container color = container.getMetaDataEntry("color_code") brand = container.getMetaDataEntry("brand") material_type = container.getMetaDataEntry("material") diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index a26fc2eeaa..2ab9e701eb 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -89,7 +89,7 @@ class XmlMaterialProfile(InstanceContainer): self.setProperty(k, "value", v) return # Update the root material container - root_material_container = material_group.root_material_node.getContainer() + root_material_container = material_group.root_material_node.container if root_material_container is not None: root_material_container.setMetaDataEntry(key, value, apply_to_all = False) for k, v in new_setting_values_dict.items(): @@ -97,7 +97,7 @@ class XmlMaterialProfile(InstanceContainer): # Update all containers derived from it for node in material_group.derived_material_node_list: - container = node.getContainer() + container = node.container if container is not None: container.setMetaDataEntry(key, value, apply_to_all = False) for k, v in new_setting_values_dict.items(): diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 95accdb6e3..b77def1fa4 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -48,12 +48,12 @@ def test_createMachine(application, container_registry, definition_container, gl variant_manager = MagicMock(name = "Variant Manager") quality_manager = MagicMock(name = "Quality Manager") global_variant_node = MagicMock( name = "global variant node") - global_variant_node.getContainer = MagicMock(return_value = global_variant) + global_variant_node.container = global_variant variant_manager.getDefaultVariantNode = MagicMock(return_value = global_variant_node) quality_group = QualityGroup(name = "zomg", quality_type = "normal") quality_group.node_for_global = MagicMock(name = "Node for global") - quality_group.node_for_global.getContainer = MagicMock(return_value = quality_container) + quality_group.node_for_global.container = quality_container quality_manager.getQualityGroups = MagicMock(return_value = {"normal": quality_group}) application.getContainerRegistry = MagicMock(return_value=container_registry) From fb509a069228f4e57d85b95bad8c4134e4ee7701 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 13:40:46 +0200 Subject: [PATCH 155/994] Fix setting the global quality node Otherwise you'd get a KeyError there. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index b141434437..ce552ea657 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -1,11 +1,10 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING, Optional, cast, Dict, List, Set +from typing import TYPE_CHECKING, Optional, Dict -from PyQt5.QtCore import QObject, QTimer, pyqtSignal, pyqtSlot +from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot -from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.InstanceContainer import InstanceContainer @@ -117,7 +116,7 @@ class QualityManager(QObject): nozzle_name = extruder.variant.getName() material_base = extruder.material.getMetaDataEntry("base_file") if nozzle_name not in machine_node.variants or material_base not in machine_node.variants[nozzle_name].materials: - # The printer has no variant/material-specific quality profiles. Return the global quality profiles. + # The printer has no variant/material-specific quality profiles. Use the global quality profiles. qualities_per_type_per_extruder[extruder_nr] = machine_node.global_qualities else: # Use the actually specialised quality profiles. @@ -126,8 +125,8 @@ class QualityManager(QObject): # Create the quality group for each available type. quality_groups = {} for quality_type, global_quality_node in machine_node.global_qualities.items(): - quality_groups[quality_type].node_for_global = global_quality_node quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in qualities_per_type_per_extruder: quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] From 1609138d4dfb34798b7b7b31ca4b50dfe302e1ee Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 15 Aug 2019 13:56:41 +0200 Subject: [PATCH 156/994] Remove deprecated ContainerNode.getChildNode(...) calls. part of CURA-6600 --- cura/Machines/MaterialManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 350947ed42..0c0064b721 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -206,10 +206,10 @@ class MaterialManager(QObject): # Fallback for "fdmprinter" if the machine-specific materials cannot be found if machine_node is None: machine_node = machine_nozzle_buildplate_material_map.get(self._default_machine_definition_id) - if machine_node is not None and nozzle_name is not None: - nozzle_node = machine_node.getChildNode(nozzle_name) - if nozzle_node is not None and buildplate_name is not None: - buildplate_node = nozzle_node.getChildNode(buildplate_name) + if machine_node is not None and nozzle_name is not None and nozzle_name in machine_node.children_map: + nozzle_node = machine_node.children_map[nozzle_name] + if nozzle_node is not None and buildplate_name is not None and buildplate_name in nozzle_node.children_map: + buildplate_node = nozzle_node.children_map[buildplate_name] # Fallback mechanism of finding materials: # 1. buildplate-specific material From ca163ea5f09f8ff3fe9fd205906aded09543a838 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 14:01:12 +0200 Subject: [PATCH 157/994] Skip inactive extruders to determine available quality types Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 07ef857af4..73660ddfff 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -112,7 +112,7 @@ class QualityManager(QObject): qualities_per_type_per_extruder = {} # type: Dict[str, Dict[str, QualityNode]] for extruder_nr, extruder in global_stack.extruders.items(): if not extruder.isEnabled: - continue # No qualities available in this extruder. It'll get skipped when intersecting the quality types. + continue # No qualities available in this extruder. It'll get skipped when intersecting the quality types. nozzle_name = extruder.variant.getName() material_base = extruder.material.getMetaDataEntry("base_file") if nozzle_name not in machine_node.variants or material_base not in machine_node.variants[nozzle_name].materials: @@ -131,7 +131,9 @@ class QualityManager(QObject): quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] available_quality_types = set(quality_groups.keys()) - for qualities_per_type in qualities_per_type_per_extruder.values(): + for extruder_nr, qualities_per_type in qualities_per_type_per_extruder.items(): + if not global_stack.extruders[extruder_nr].isEnabled: + continue available_quality_types.intersection_update(qualities_per_type.keys()) for quality_type in available_quality_types: quality_groups[quality_type].is_available = True From bee5491879430298efda8a56592aa502bbb80247 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 14:09:18 +0200 Subject: [PATCH 158/994] Move getQualityGroups to MachineNode It's specific to that machine and the container tree structure, so this is the best place for it we could find. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 50 ++++++++++++++++++++++++++++++++- cura/Machines/QualityManager.py | 42 +++++++-------------------- 2 files changed, 59 insertions(+), 33 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index b474ae94bd..4caceb3026 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -1,13 +1,14 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import List, TYPE_CHECKING from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode @@ -40,6 +41,53 @@ class MachineNode(ContainerNode): container_registry.containerAdded.connect(self._variantAdded) self._loadAll() + ## Get the available quality groups for this machine. + # + # This returns all quality groups, regardless of whether they are + # available to the combination of extruders or not. On the resulting + # quality groups, the is_available property is set to indicate whether the + # quality group can be selected according to the combination of extruders + # in the parameters. + # \param variant_names The names of the variants loaded in each extruder. + # \param material_bases The base file names of the materials loaded in + # each extruder. + # \param extruder_enabled Whether or not the extruders are enabled. This + # allows the function to set the is_available properly. + # \return For each available quality type, a QualityGroup instance. + def getQualityGroups(self, variant_names: List[str], material_bases: List[str], extruder_enabled: List[bool]) -> Dict[str, QualityGroup]: + if len(variant_names) != len(material_bases) or len(variant_names) != len(extruder_enabled): + Logger.log("e", "The number of extruders in the list of variants (" + str(len(variant_names)) + ") is not equal to the number of extruders in the list of materials (" + str(len(material_bases)) + ") or the list of enabled extruders (" + str(len(extruder_enabled)) + ").") + return {} + # For each extruder, find which quality profiles are available. Later we'll intersect the quality types. + qualities_per_type_per_extruder = [] # type: List[Dict[str, QualityNode]] + for extruder_nr, variant_name in enumerate(variant_names): + if not extruder_enabled[extruder_nr]: + continue # No qualities are available in this extruder. It'll get skipped when calculating the available quality types. + material_base = material_bases[extruder_nr] + if variant_name not in self.variants or material_base not in self.variants[variant_name].materials: + # The printer has no variant/material-specific quality profiles. Use the global quality profiles. + qualities_per_type_per_extruder[extruder_nr] = self.global_qualities + else: + # Use the actually specialised quality profiles. + qualities_per_type_per_extruder[extruder_nr] = self.variants[variant_name].materials[material_base].qualities + + # Create the quality group for each available type. + quality_groups = {} + for quality_type, global_quality_node in self.global_qualities.items(): + quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + quality_groups[quality_type].node_for_global = global_quality_node + for extruder, qualities_per_type in qualities_per_type_per_extruder: + quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] + + available_quality_types = set(quality_groups.keys()) + for extruder_nr, qualities_per_type in enumerate(qualities_per_type_per_extruder): + if not extruder_enabled[extruder_nr]: + continue + available_quality_types.intersection_update(qualities_per_type.keys()) + for quality_type in available_quality_types: + quality_groups[quality_type].is_available = True + return quality_groups + ## (Re)loads all variants under this printer. def _loadAll(self): # Find all the variants for this definition ID. diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 73660ddfff..c71d97b76e 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -105,39 +105,17 @@ class QualityManager(QObject): # \return A dictionary with quality types as keys and the quality groups # for those types as values. def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: + # Gather up the variant names and material base files for each extruder. + variant_names = [] + material_bases = [] + extruder_enabled = [] + for extruder in global_stack.extruders.values(): + variant_names.append(extruder.variant.getName()) + material_bases.append(extruder.material.getMetaDataEntry("base_file")) + extruder_enabled.append(extruder.isEnabled) + definition_id = global_stack.definition.getId() - machine_node = ContainerTree.getInstance().machines[definition_id] - - # For each extruder, find which quality profiles are available. Later we'll intersect the quality types. - qualities_per_type_per_extruder = {} # type: Dict[str, Dict[str, QualityNode]] - for extruder_nr, extruder in global_stack.extruders.items(): - if not extruder.isEnabled: - continue # No qualities available in this extruder. It'll get skipped when intersecting the quality types. - nozzle_name = extruder.variant.getName() - material_base = extruder.material.getMetaDataEntry("base_file") - if nozzle_name not in machine_node.variants or material_base not in machine_node.variants[nozzle_name].materials: - # The printer has no variant/material-specific quality profiles. Use the global quality profiles. - qualities_per_type_per_extruder[extruder_nr] = machine_node.global_qualities - else: - # Use the actually specialised quality profiles. - qualities_per_type_per_extruder[extruder_nr] = machine_node.variants[nozzle_name].materials[material_base].qualities - - # Create the quality group for each available type. - quality_groups = {} - for quality_type, global_quality_node in machine_node.global_qualities.items(): - quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) - quality_groups[quality_type].node_for_global = global_quality_node - for extruder, qualities_per_type in qualities_per_type_per_extruder: - quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] - - available_quality_types = set(quality_groups.keys()) - for extruder_nr, qualities_per_type in qualities_per_type_per_extruder.items(): - if not global_stack.extruders[extruder_nr].isEnabled: - continue - available_quality_types.intersection_update(qualities_per_type.keys()) - for quality_type in available_quality_types: - quality_groups[quality_type].is_available = True - return quality_groups + return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) def getQualityGroupsForMachineDefinition(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) From 370d7adcd5ae46d90dabe95e6f29df2a2a2b96a5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 14:20:58 +0200 Subject: [PATCH 159/994] Let getDefaultQualityType use the container tree structure Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 1 + cura/Machines/QualityManager.py | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 4caceb3026..a302123044 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -37,6 +37,7 @@ class MachineNode(ContainerNode): self.quality_definition = my_metadata.get("quality_definition", container_id) self.exclude_materials = my_metadata.get("exclude_materials", []) self.preferred_variant_name = my_metadata.get("preferred_variant_name", "") + self.preferred_quality_type = my_metadata.get("preferred_quality_type", "") container_registry.containerAdded.connect(self._variantAdded) self._loadAll() diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index c71d97b76e..6227653040 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -140,11 +140,20 @@ class QualityManager(QObject): return quality_group_dict - def getDefaultQualityType(self, machine: "GlobalStack") -> Optional[QualityGroup]: - preferred_quality_type = machine.definition.getMetaDataEntry("preferred_quality_type") - quality_group_dict = self.getQualityGroups(machine) - quality_group = quality_group_dict.get(preferred_quality_type) - return quality_group + def getDefaultQualityType(self, machine: "GlobalStack") -> QualityGroup: + machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] + variant_names = [] + material_bases = [] + extruder_enabled = [] + for extruder in machine.extruders.values(): + variant_names.append(extruder.variant.getName()) + material_bases.append(extruder.material.getMetaDataEntry("base_file")) + extruder_enabled.append(extruder.isEnabled) + quality_groups = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled) + result = quality_groups.get(machine_node.preferred_quality_type) + if result is not None: + return result + return next(iter(quality_groups.values())) # If preferred quality type is not available, pick any quality type. # From 02fbdd96a4c6e350652126a26d1f420e0d92f884 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 14:26:28 +0200 Subject: [PATCH 160/994] Don't return quality groups that are not available And don't return an arbitrary group then. That arbitrary group could also be unavailable. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 6227653040..664b091001 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -140,20 +140,22 @@ class QualityManager(QObject): return quality_group_dict - def getDefaultQualityType(self, machine: "GlobalStack") -> QualityGroup: + ## Get the quality group for the preferred quality type for a certain + # global stack. + # + # If the preferred quality type is not available, ``None`` will be + # returned. + # \param machine The global stack of the machine to get the preferred + # quality group for. + # \return The preferred quality group, or ``None`` if that is not + # available. + def getDefaultQualityType(self, machine: "GlobalStack") -> Optional[QualityGroup]: machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] - variant_names = [] - material_bases = [] - extruder_enabled = [] - for extruder in machine.extruders.values(): - variant_names.append(extruder.variant.getName()) - material_bases.append(extruder.material.getMetaDataEntry("base_file")) - extruder_enabled.append(extruder.isEnabled) - quality_groups = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled) + quality_groups = self.getQualityGroups(machine) result = quality_groups.get(machine_node.preferred_quality_type) - if result is not None: + if result is not None and result.is_available: return result - return next(iter(quality_groups.values())) # If preferred quality type is not available, pick any quality type. + return None # If preferred quality type is not available, leave it up for the caller. # From 44c98ba0d1a0a63a02db0f1e71af8bb93269fe5a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 14:38:35 +0200 Subject: [PATCH 161/994] Fix import Should've checked first... Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index a302123044..d5a9739e53 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import List, TYPE_CHECKING +from typing import Dict, List from UM.Logger import Logger from UM.Util import parseBool @@ -12,9 +12,6 @@ from cura.Machines.QualityGroup import QualityGroup # To construct groups of qu from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode -if TYPE_CHECKING: - from typing import Dict - ## This class represents a machine in the container tree. # # The subnodes of these nodes are variants. From 8a515822102d68e2ce0f1e4f52d87b509c7029ef Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:17:19 +0200 Subject: [PATCH 162/994] Pre-fill list of qualities_per_type_per_extruder with empty dicts Otherwise you get an IndexError later on. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index d5a9739e53..990aeae935 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -57,7 +57,7 @@ class MachineNode(ContainerNode): Logger.log("e", "The number of extruders in the list of variants (" + str(len(variant_names)) + ") is not equal to the number of extruders in the list of materials (" + str(len(material_bases)) + ") or the list of enabled extruders (" + str(len(extruder_enabled)) + ").") return {} # For each extruder, find which quality profiles are available. Later we'll intersect the quality types. - qualities_per_type_per_extruder = [] # type: List[Dict[str, QualityNode]] + qualities_per_type_per_extruder = [{} for _ in range(len(variant_names))] # type: List[Dict[str, QualityNode]] for extruder_nr, variant_name in enumerate(variant_names): if not extruder_enabled[extruder_nr]: continue # No qualities are available in this extruder. It'll get skipped when calculating the available quality types. From ed19e9e15c8daa24b333576a1aa1647cb455776b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:21:51 +0200 Subject: [PATCH 163/994] Use ContainerTree to find quality groups Contributes to issue CURA-6600. --- cura/Machines/Models/IntentModel.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 275087689b..c5d63183dd 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -8,6 +8,7 @@ from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry +from cura.Machines.ContainerTree import ContainerTree from cura.Settings.IntentManager import IntentManager import cura.CuraApplication @@ -47,13 +48,15 @@ class IntentModel(ListModel): def _update(self) -> None: new_items = [] # type: List[Dict[str, Any]] - application = cura.CuraApplication.CuraApplication.getInstance() - quality_manager = application.getQualityManager() - global_stack = application.getGlobalContainerStack() + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack: self.setItems(new_items) return - quality_groups = quality_manager.getQualityGroups(global_stack) + definition_id = global_stack.definition.getId() + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + quality_groups = ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) for intent_category, quality_type in IntentManager.getInstance().getCurrentAvailableIntents(): if intent_category == self._intent_category: From 3f944462edf18b9758ef29dffdcf639eb55f0f4f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:35:30 +0200 Subject: [PATCH 164/994] Use ContainerTree to get quality groups Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 11 ++++++++--- cura/Machines/QualityManager.py | 11 +++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 315ab010bb..850e001473 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -1,10 +1,11 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, pyqtSlot -from UM.Qt.ListModel import ListModel from UM.Logger import Logger +from UM.Qt.ListModel import ListModel +from cura.Machines.ContainerTree import ContainerTree # # This the QML model for the quality management page. @@ -42,7 +43,11 @@ class QualityManagementModel(ListModel): self.setItems([]) return - quality_group_dict = self._quality_manager.getQualityGroups(global_stack) + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders] + definition_id = global_stack.definition.getId() + quality_group_dict = ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) quality_changes_group_dict = self._quality_manager.getQualityChangesGroups(global_stack) available_quality_types = set(quality_type for quality_type, quality_group in quality_group_dict.items() diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 664b091001..79adef2408 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -106,14 +106,9 @@ class QualityManager(QObject): # for those types as values. def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: # Gather up the variant names and material base files for each extruder. - variant_names = [] - material_bases = [] - extruder_enabled = [] - for extruder in global_stack.extruders.values(): - variant_names.append(extruder.variant.getName()) - material_bases.append(extruder.material.getMetaDataEntry("base_file")) - extruder_enabled.append(extruder.isEnabled) - + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders] definition_id = global_stack.definition.getId() return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) From d4cd5a7ea5f74225c42b5fae8c525efc4a0cc461 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:53:38 +0200 Subject: [PATCH 165/994] Add convenience function to get quality groups for current printer This is used very often all over the code. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 20 ++++++++++++++++++- cura/Machines/Models/IntentModel.py | 6 +----- .../Machines/Models/QualityManagementModel.py | 6 +----- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 2f641973ac..e43affa714 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -5,10 +5,15 @@ from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.Interfaces import ContainerInterface +import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.MachineNode import MachineNode -from typing import Dict +from typing import Dict, List, TYPE_CHECKING import time + +if TYPE_CHECKING: + from cura.Machines.QualityGroup import QualityGroup + ## This class contains a look-up tree for which containers are available at # which stages of configuration. # @@ -29,6 +34,19 @@ class ContainerTree: container_registry.containerAdded.connect(self._machineAdded) self._loadAll() + ## Get the quality groups available for the currently activated printer. + # + # This contains all quality groups, enabled or disabled. To check whether + # the quality group can be activated, test for the + # ``QualityGroup.is_available`` property. + # \return For every quality type, one quality group. + def getCurrentQualityGroups(self) -> Dict[str, "QualityGroup"]: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + return self.machines[global_stack.definition.getId()].getQualityGroups(variant_names, material_bases, extruder_enabled) + ## Builds the initial container tree. def _loadAll(self): Logger.log("i", "Building container tree.") diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index c5d63183dd..5a44883b76 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -52,11 +52,7 @@ class IntentModel(ListModel): if not global_stack: self.setItems(new_items) return - definition_id = global_stack.definition.getId() - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] - quality_groups = ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) + quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() for intent_category, quality_type in IntentManager.getInstance().getCurrentAvailableIntents(): if intent_category == self._intent_category: diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 850e001473..2a661ec49e 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -43,11 +43,7 @@ class QualityManagementModel(ListModel): self.setItems([]) return - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders] - definition_id = global_stack.definition.getId() - quality_group_dict = ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) + quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() quality_changes_group_dict = self._quality_manager.getQualityChangesGroups(global_stack) available_quality_types = set(quality_type for quality_type, quality_group in quality_group_dict.items() From 9bcd3d8c1e7cc9493c786b99e3bf2794e6f78e85 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:55:24 +0200 Subject: [PATCH 166/994] Use ContainerTree to get quality groups instead of QualityManager Contributes to issue CURA-6600. --- cura/Settings/CuraStackBuilder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index e5bce516bf..d0424983cd 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -28,7 +28,6 @@ class CuraStackBuilder: def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - quality_manager = application.getQualityManager() registry = application.getContainerRegistry() definitions = registry.findDefinitionContainers(id = definition_id) @@ -64,7 +63,7 @@ class CuraStackBuilder: registry.addContainer(new_extruder) preferred_quality_type = machine_definition.getMetaDataEntry("preferred_quality_type") - quality_group_dict = quality_manager.getQualityGroups(new_global_stack) + quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() if not quality_group_dict: # There is no available quality group, set all quality containers to empty. new_global_stack.quality = application.empty_quality_container From 606bef9b5fc348fd97c0b80f3fc7ba9873fbcef0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 16:58:57 +0200 Subject: [PATCH 167/994] Use ContainerTree structure to get quality groups Contributes to issue CURA-6600. --- cura/Settings/IntentManager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 5a3c1a737f..2cfbf11ae2 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -4,6 +4,7 @@ from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING import cura.CuraApplication +from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_intent_container from UM.Settings.InstanceContainer import InstanceContainer @@ -75,7 +76,8 @@ class IntentManager(QObject): # TODO: We now do this (return a default) if the global stack is missing, but not in the code below, # even though there should always be defaults. The problem then is what to do with the quality_types. # Currently _also_ inconsistent with 'currentAvailableIntentCategories', which _does_ return default. - quality_groups = application.getQualityManager().getQualityGroups(global_stack) + quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() + # TODO: These quality nodes in that tree already contain the intent nodes. We can optimise this. available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} final_intent_ids = set() # type: Set[str] From 46e5bc897f8a5f2e254cd02ecb52601376a96ebc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Aug 2019 17:00:43 +0200 Subject: [PATCH 168/994] Fix deprecated getQualityGroups in QualityManager It needs to get the actual extruders, not their keys. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 79adef2408..57bcaa9c70 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -106,9 +106,9 @@ class QualityManager(QObject): # for those types as values. def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: # Gather up the variant names and material base files for each extruder. - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] definition_id = global_stack.definition.getId() return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) From 7ed8d0b2f71cbe46040a68dacb1322fb8d80da37 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 16 Aug 2019 09:37:58 +0200 Subject: [PATCH 169/994] Remove deprecated .getMetadata() call. part of CURA-6600 --- plugins/UM3NetworkPrinting/src/SendMaterialJob.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py index 697ba33a6b..db9866c796 100644 --- a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py @@ -7,6 +7,7 @@ from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest from UM.Job import Job from UM.Logger import Logger +from UM.Settings import ContainerRegistry from cura.CuraApplication import CuraApplication from .Models.ClusterMaterial import ClusterMaterial @@ -171,7 +172,7 @@ class SendMaterialJob(Job): # Find the latest version of all material containers in the registry. for root_material_id, material_group in material_group_dict.items(): - material_metadata = material_group.root_material_node.getMetadata() + material_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = material_group.root_material_node.container_id)[0] try: # material version must be an int From 8d05ebef9dea11a4aa0e6238cd6175c260c8019b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Aug 2019 10:24:50 +0200 Subject: [PATCH 170/994] Fix crash on adding a new printer CURA-6600 --- cura/Machines/ContainerTree.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index e43affa714..ca24950c78 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -42,6 +42,8 @@ class ContainerTree: # \return For every quality type, one quality group. def getCurrentQualityGroups(self) -> Dict[str, "QualityGroup"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return {} variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] From e4a4e965f93cb8e7c10f3ff58415ca82a8242138 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Fri, 16 Aug 2019 10:26:49 +0200 Subject: [PATCH 171/994] Removing_supprot_for_generic_materials --- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index 3e40732f74..ed6eefaffe 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = a weight = 1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 40846dddc8..5501c91687 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 0 -material = generic_abs +material = emotiontech_abs variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index f21737f4cb..f60244024a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = -1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index fb2398dc39..905a8dd7d8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = a weight = 1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index ee09d737b6..d718ca9b76 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 0 -material = generic_petg +material = emotiontech_petg variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index e76d94c014..dac95a12ea 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = -1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index b69bffc010..a490d8c582 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = a weight = 1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index 43ea198edf..690463fd32 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 0 -material = generic_pla +material = emotiontech_pla variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index 0c64f0c061..c701cb0143 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = -1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.4 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index e9f70f90c0..ec1cae9ddb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 054dd9fe6c..3e38e488f0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 0 -material = generic_abs +material = emotiontech_abs variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 0ca7f6b5aa..496dbbd7f3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = -1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index 812e5e6004..75282edd6e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index c92efe23e4..9a36e8e390 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 0 -material = generic_petg +material = emotiontech_petg variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 72249c3a59..8a6c2bd566 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = -1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 2e1a08ecca..8380b66240 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = b weight = 1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index c2f254e322..9323ee2933 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 0 -material = generic_pla +material = emotiontech_pla variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index c03cd12b4d..94a7e3eb72 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = -1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.6 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index 106bf05af4..0ace94666d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 4e7d19e1d7..627bf8e94d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = 0 -material = generic_abs +material = emotiontech_abs variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 693c4e3d09..5b1c21787b 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = e weight = -1 -material = generic_abs +material = emotiontech_abs variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 148b3fc309..46cc77abc7 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 58991f5de9..660f6e9039 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = 0 -material = generic_petg +material = emotiontech_petg variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index ab38f97ece..d33718b6b7 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = e weight = -1 -material = generic_petg +material = emotiontech_petg variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index 5ae5415636..b7827fe783 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = c weight = 1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index 7094088e4f..b589f1a405 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = d weight = 0 -material = generic_pla +material = emotiontech_pla variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index de9c0e8c16..38875405b9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = e weight = -1 -material = generic_pla +material = emotiontech_pla variant = Standard 0.8 [values] diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg index 2ebc3c7c0d..8ba4dbff9c 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -8,7 +8,7 @@ setting_version = 8 type = quality quality_type = h weight = -1 -material = generic_pla +material = emotiontech_pla variant = Standard 1.2 [values] From 97e77994a1ff19462e13f596ceee8a6b0fa4a725 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Aug 2019 10:55:12 +0200 Subject: [PATCH 172/994] Update the removing & duplicating of material CURA-6600 --- cura/Machines/MaterialManager.py | 43 +++++++++++--------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index bbe305a01b..d2eb829eec 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -254,25 +254,13 @@ class MaterialManager(QObject): return node def removeMaterialByRootId(self, root_material_id: str): - material_group = self.getMaterialGroup(root_material_id) - if not material_group: - Logger.log("i", "Unable to remove the material with id %s, because it doesn't exist.", root_material_id) - return - container_registry = CuraContainerRegistry.getInstance() - nodes_to_remove = [material_group.root_material_node] + material_group.derived_material_node_list - # Sort all nodes with respect to the container ID lengths in the ascending order so the base material container - # will be the first one to be removed. We need to do this to ensure that all containers get loaded & deleted. - nodes_to_remove = sorted(nodes_to_remove, key = lambda x: len(x.getMetaDataEntry("id", ""))) - # Try to load all containers first. If there is any faulty ones, they will be put into the faulty container - # list, so removeContainer() can ignore those ones. - for node in nodes_to_remove: - container_id = node.getMetaDataEntry("id", "") - results = container_registry.findContainers(id = container_id) - if not results: - container_registry.addWrongContainerId(container_id) - for node in nodes_to_remove: - container_registry.removeContainer(node.getMetaDataEntry("id", "")) + results = container_registry.findContainers(id=root_material_id) + if not results: + container_registry.addWrongContainerId(root_material_id) + + for result in results: + container_registry.removeContainer(result.getMetaDataEntry("id", "")) # # Methods for GUI @@ -327,14 +315,14 @@ class MaterialManager(QObject): def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: root_material_id = cast(str, material_node.getMetaDataEntry("base_file", "")) - material_group = self.getMaterialGroup(root_material_id) - if not material_group: + container_registry = CuraContainerRegistry.getInstance() + results = container_registry.findContainers(id=root_material_id) + + if not results: Logger.log("i", "Unable to duplicate the material with id %s, because it doesn't exist.", root_material_id) return None - base_container = material_group.root_material_node.container - if not base_container: - return None + base_container = results[0] # Ensure all settings are saved. cura.CuraApplication.CuraApplication.getInstance().saveSettings() @@ -353,11 +341,9 @@ class MaterialManager(QObject): new_containers.append(new_base_container) # Clone all of them. - for node in material_group.derived_material_node_list: - container_to_copy = node.container - if not container_to_copy: - continue - # Create unique IDs for every clone. + for container_to_copy in container_registry.findContainers(base_file= root_material_id): + if container_to_copy.getId() == root_material_id: + continue # We already have that one, skip it new_id = new_base_id if container_to_copy.getMetaDataEntry("definition") != "fdmprinter": new_id += "_" + container_to_copy.getMetaDataEntry("definition") @@ -371,7 +357,6 @@ class MaterialManager(QObject): if new_metadata is not None: for key, value in new_metadata.items(): new_container.getMetaData()[key] = value - new_containers.append(new_container) for container_to_add in new_containers: From 80baeb98736a223775d82bf51689e25fa60324cb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 16 Aug 2019 16:28:42 +0200 Subject: [PATCH 173/994] Remove _added functions for nodes that can't be added during runtime Among the machines, variants, materials, qualities and intents, only machines and materials can ever be added during runtime. For the rest, we don't need to listen to these signals. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 19 +--------- cura/Machines/MaterialNode.py | 42 ++-------------------- cura/Machines/QualityNode.py | 21 +---------- tests/Machines/TestMachineNode.py | 24 +------------ tests/Machines/TestMaterialNode.py | 58 +----------------------------- tests/Machines/TestQualityNode.py | 31 +--------------- 6 files changed, 7 insertions(+), 188 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 990aeae935..f0a001b2d6 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -6,7 +6,6 @@ from typing import Dict, List from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. -from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. from cura.Machines.QualityNode import QualityNode @@ -36,7 +35,6 @@ class MachineNode(ContainerNode): self.preferred_variant_name = my_metadata.get("preferred_variant_name", "") self.preferred_quality_type = my_metadata.get("preferred_quality_type", "") - container_registry.containerAdded.connect(self._variantAdded) self._loadAll() ## Get the available quality groups for this machine. @@ -101,19 +99,4 @@ class MachineNode(ContainerNode): if len(global_qualities) == 0: # This printer doesn't override the global qualities. global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = True) # Otherwise pick the global global qualities. for global_quality in global_qualities: - self.global_qualities[global_quality["quality_type"]] = QualityNode(global_quality["id"], parent = self) - - ## When a variant gets added to the set of profiles, we need to update our - # tree here. - def _variantAdded(self, container: ContainerInterface): - if container.getMetaDataEntry("type") != "variant": - return # Not interested. - name = container.getMetaDataEntry("name") - if name in self.variants: - return # Already have this one. - if container.getMetaDataEntry("hardware_type") != "nozzle": - return # Only want nozzles in my tree. - if container.getMetaDataEntry("definition") != self.container_id: - return # Not a nozzle that fits in my machine. - - self.variants[name] = VariantNode(container.getId(), machine = self) \ No newline at end of file + self.global_qualities[global_quality["quality_type"]] = QualityNode(global_quality["id"], parent = self) \ No newline at end of file diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 5fa28de77f..31a73f9e2f 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -4,7 +4,6 @@ from typing import TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode @@ -20,10 +19,8 @@ class MaterialNode(ContainerNode): super().__init__(container_id) self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. - container_registry = ContainerRegistry.getInstance() - my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = container_id)[0] self.base_file = my_metadata["base_file"] - container_registry.containerAdded.connect(self._qualityAdded) self._loadAll() def _loadAll(self) -> None: @@ -47,39 +44,4 @@ class MaterialNode(ContainerNode): for quality in qualities: quality_id = quality["id"] if quality_id not in self.qualities: - self.qualities[quality_id] = QualityNode(quality_id, parent = self) - - def _qualityAdded(self, container: ContainerInterface) -> None: - if container.getMetaDataEntry("type") != "quality": - return # Not interested. - if not self.variant.machine.has_machine_quality: - if container.getMetaDataEntry("definition") != "fdmprinter": - return # Only want global qualities. - else: - if container.getMetaDataEntry("definition") != self.variant.machine.quality_definition: - return # Doesn't match the machine. - if container.getMetaDataEntry("variant") != self.variant.variant_name: - return # Doesn't match the variant. - # Detect if we're falling back to matching via GUID. - # If so, we might need to erase the current list and put just this one in (i.e. no longer use the fallback). - container_registry = ContainerRegistry.getInstance() - my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] - my_material_type = my_metadata.get("material") - allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type)} - # Select any quality profile; if the material is not matching by material type, we've been falling back to GUID all along. - is_fallback_guid = len(self.qualities) == 0 or next(iter(self.qualities.values())).getMetaDataEntry("material") not in allowed_material_ids - - if is_fallback_guid and container.getMetaDataEntry("material") in allowed_material_ids: # So far we needed the fallback, but no longer! - self.qualities.clear() # It'll get filled with the new quality profile then. - else: - if not is_fallback_guid: - if container.getMetaDataEntry("material") not in allowed_material_ids: - return # Doesn't match the material type. - else: - my_material_guid = my_metadata.get("GUID") - allowed_material_ids = {metadata["id"] for metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_material_guid)} - if container.getMetaDataEntry("material") not in allowed_material_ids: - return # Doesn't match the material GUID. - - quality_id = container.getId() - self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file + self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 8e58700589..09785056f1 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -4,7 +4,6 @@ from typing import Union, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.IntentNode import IntentNode @@ -21,7 +20,6 @@ class QualityNode(ContainerNode): super().__init__(container_id) self.parent = parent self.intents = {} # type: Dict[str, IntentNode] - ContainerRegistry.getInstance().containerAdded.connect(self._intentAdded) self._loadAll() def _loadAll(self) -> None: @@ -31,21 +29,4 @@ class QualityNode(ContainerNode): if not isinstance(self.parent, MachineNode): # Not a global profile. for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) - # Otherwise, there are no intents for global profiles. - - def _intentAdded(self, container: ContainerInterface) -> None: - from cura.Machines.MachineNode import MachineNode # Imported here to prevent circular imports. - if container.getMetaDataEntry("type") != "intent": - return # Not interested if it's not an intent. - if isinstance(self.parent, MachineNode): - return # Global profiles don't have intents. - if container.getMetaDataEntry("definition") != self.parent.variant.machine.quality_definition: - return # Incorrect printer. - if container.getMetaDataEntry("variant") != self.parent.variant.variant_name: - return # Incorrect variant. - if container.getMetaDataEntry("material") != self.parent.base_file: - return # Incorrect material. - container_id = container.getId() - if container_id in self.intents: - return # Already have this. - self.intents[container_id] = IntentNode(container_id, quality = self) \ No newline at end of file + # Otherwise, there are no intents for global profiles. \ No newline at end of file diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index db3946fc3a..fe0330609a 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -4,14 +4,6 @@ import pytest from UM.Settings.Interfaces import ContainerInterface from cura.Machines.MachineNode import MachineNode - -machine_node_variant_added_test_data = [({"type": "Not a variant!"}, ["Variant One", "Variant Two"]), # Wrong type - ({"type": "variant", "name": "Variant One"}, ["Variant One", "Variant Two"]), # Name already added - ({"type": "variant", "name": "Variant Three", "hardware_type": "Not a nozzle"}, ["Variant One", "Variant Two"]), # Wrong hardware type - ({"type": "variant", "name": "Variant Three", "hardware_type": "nozzle", "definition": "machine_3"}, ["Variant One", "Variant Two"]), # Wrong definition ID - ({"type": "variant", "name": "Variant Three", "hardware_type": "nozzle", "definition": "machine_1"}, ["Variant One", "Variant Two", "Variant Three"])] # Yay! It's finally added - - metadata_dict = {} @@ -44,18 +36,4 @@ def test_machineNodeInit(container_registry): # As variants get stored by name, we want to check if those get added. assert "Variant One" in machine_node.variants assert "Variant Two" in machine_node.variants - assert len(machine_node.variants) == 2 # And ensure that *only* those two got added. - - -@pytest.mark.parametrize("metadata,variant_result_list", machine_node_variant_added_test_data) -def test_machineNodeVariantAdded(container_registry, metadata, variant_result_list): - machine_node = createMachineNode("machine_1", container_registry) - - with patch("cura.Machines.MachineNode.VariantNode"): # We're not testing the variant node here, so patch it out. - with patch.dict(metadata_dict, metadata): - mocked_container = createMockedInstanceContainer() - machine_node._variantAdded(mocked_container) - - assert len(variant_result_list) == len(machine_node.variants) - for name in variant_result_list: - assert name in machine_node.variants \ No newline at end of file + assert len(machine_node.variants) == 2 # And ensure that *only* those two got added. \ No newline at end of file diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index 099be2b891..f9ea0e3622 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -6,21 +6,6 @@ from cura.Machines.MaterialNode import MaterialNode instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"id": "quality_1", "material": "material_1"}]}, "machine_1": {"variant_1": {"material_1": [{"id": "quality_2", "material": "material_1"}, {"id": "quality_3","material": "material_1"}]}}} - -quality_metadata_machine_quality_test_data = [({"type": "Not a quality"}, ["quality_2", "quality_3"]), # Wrong type - ({"type": "quality", "definition": "machine_2"}, ["quality_2", "quality_3"]), # Wrong defintion - ({"type": "quality", "definition": "machine_1", "variant": "variant_2"}, ["quality_2", "quality_3"]), # Wrong variant - ({"type": "quality", "definition": "machine_1", "variant": "variant_1", "material": "material_2"}, ["quality_2", "quality_3"]), # wrong material - - ] - -quality_metadata_no_machine_quality =[({"type": "Not a quality"}, ["quality_1"]), # Wrong type - ({"type": "quality", "definition": "machine_1"}, ["quality_1"]), # Wrong defintion (it needs fdmprinter) - ({"type": "quality", "definition": "fdmprinter", "variant": "variant_2"}, ["quality_1", "quality_4"]), # Wrong variant, but should be added (as we ignore the variant) - ({"type": "quality", "definition": "fdmprinter", "variant": "variant_1", "material": "material_2"}, ["quality_1", "quality_4"]), # wrong material, but should be added (as we ignore the material) - ({"type": "quality", "definition": "fdmprinter", "variant": "variant_1", "material": "material_1"}, ["quality_1", "quality_4"]), - ] - metadata_dict = {} @@ -86,45 +71,4 @@ def test_materialNodeInit_MachineQuality(container_registry): assert len(node.qualities) == 2 assert "quality_2" in node.qualities - assert "quality_3" in node.qualities - - -@pytest.mark.parametrize("metadata,qualities_result_list", quality_metadata_machine_quality_test_data) -def test_qualityAdded_hasMachineQuality(container_registry, metadata, qualities_result_list): - variant_node = MagicMock() - variant_node.variant_name = "variant_1" - variant_node.machine.has_machine_quality = True - variant_node.machine.quality_definition = "machine_1" - - container = createMockedInstanceContainer("quality_4") - - with patch("cura.Machines.MaterialNode.QualityNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - node = MaterialNode("material_1", variant_node) - - with patch.dict(metadata_dict, metadata): - node._qualityAdded(container) - - assert len(qualities_result_list) == len(node.qualities) - for name in qualities_result_list: - assert name in node.qualities - - -@pytest.mark.parametrize("metadata,qualities_result_list", quality_metadata_no_machine_quality) -def test_qualityAdded_noMachineQuality(container_registry, metadata, qualities_result_list): - variant_node = MagicMock() - variant_node.variant_name = "variant_1" - variant_node.machine.has_machine_quality = False - - container = createMockedInstanceContainer("quality_4") - - with patch("cura.Machines.MaterialNode.QualityNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - node = MaterialNode("material_1", variant_node) - - with patch.dict(metadata_dict, metadata): - node._qualityAdded(container) - - assert len(qualities_result_list) == len(node.qualities) - for name in qualities_result_list: - assert name in node.qualities \ No newline at end of file + assert "quality_3" in node.qualities \ No newline at end of file diff --git a/tests/Machines/TestQualityNode.py b/tests/Machines/TestQualityNode.py index cad30d642c..64685689c2 100644 --- a/tests/Machines/TestQualityNode.py +++ b/tests/Machines/TestQualityNode.py @@ -1,21 +1,12 @@ from unittest.mock import patch, MagicMock import pytest -from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityNode import QualityNode instance_container_metadata_dict = {"fdmprinter": {"variant_1": {"material_1": [{"id": "intent_1"}, {"id": "intent_2"}]}}, "machine_1": {"variant_2": {"material_2": [{"id": "intent_3"}, {"id": "intent_4"}]}}} - -intent_metadata_intent_added_data = [({"type": "Not an intent"}, ["intent_3", "intent_4"]), # Wrong type - ({"type": "intent", "definition": "machine_9000"}, ["intent_3", "intent_4"]), # wrong definition - ({"type": "intent", "definition": "machine_1", "variant": "variant_299101"}, ["intent_3", "intent_4"]), # wrong variant - ({"type": "intent", "definition": "machine_1", "variant": "variant_2", "material": "super cool material!"}, ["intent_3", "intent_4"]), # Wrong material - ({"type": "intent", "definition": "machine_1", "variant": "variant_2", "material": "material_2"}, ["intent_3", "intent_4", "intent_9001"]), # Yay, all good. -] - metadata_dict = {} @@ -55,24 +46,4 @@ def test_qualityNode_machine_1(container_registry): assert len(node.intents) == 2 assert "intent_3" in node.intents - assert "intent_4" in node.intents - -@pytest.mark.parametrize("metadata,intent_result_list", intent_metadata_intent_added_data) -def test_intentNodeAdded(container_registry, metadata, intent_result_list): - material_node = MagicMock() - material_node.variant.machine.quality_definition = "machine_1" - material_node.variant.variant_name = "variant_2" - material_node.base_file = "material_2" - - intent_container = createMockedInstanceContainer("intent_9001") - - with patch("cura.Machines.QualityNode.IntentNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - node = QualityNode("quality_1", material_node) - with patch.dict(metadata_dict, metadata): - node._intentAdded(intent_container) - - assert len(intent_result_list) == len(node.intents) - for identifier in intent_result_list: - assert identifier in node.intents - + assert "intent_4" in node.intents \ No newline at end of file From 4dd5cb1a85440b54337e3abebfff877c554b7bf2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 09:44:39 +0200 Subject: [PATCH 174/994] Fix getMaterialByType CURA-6600 --- cura/Machines/MaterialManager.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index d2eb829eec..973b47fce8 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -152,27 +152,10 @@ class MaterialManager(QObject): # def getMaterialNodeByType(self, global_stack: "GlobalStack", position: str, nozzle_name: str, buildplate_name: Optional[str], material_guid: str) -> Optional["MaterialNode"]: - node = None machine_definition = global_stack.definition - extruder_definition = global_stack.extruders[position].definition - if parseBool(machine_definition.getMetaDataEntry("has_materials", False)): - material_diameter = extruder_definition.getProperty("material_diameter", "value") - if isinstance(material_diameter, SettingFunction): - material_diameter = material_diameter(global_stack) + variant_name = global_stack.extruders[position].variant.getName() - # Look at the guid to material dictionary - root_material_id = None - for material_group in self._guid_material_groups_map[material_guid]: - root_material_id = cast(str, material_group.root_material_node.getMetaDataEntry("id", "")) - break - - if not root_material_id: - Logger.log("i", "Cannot find materials with guid [%s] ", material_guid) - return None - - node = self.getMaterialNode(machine_definition.getId(), nozzle_name, buildplate_name, - material_diameter, root_material_id) - return node + return self.getMaterialNode(machine_definition.getId(), variant_name, buildplate_name, 3, material_guid) # There are 2 ways to get fallback materials; # - A fallback by type (@sa getFallbackMaterialIdByMaterialType), which adds the generic version of this material From 76b58134aefd411e00145b75089e7f6928fc15b2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 11:07:35 +0200 Subject: [PATCH 175/994] Fix getRootMaterialIdForDiameter CURA-6600 --- cura/Machines/MaterialManager.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 973b47fce8..09416d1704 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -87,7 +87,15 @@ class MaterialManager(QObject): return self._material_group_map.get(root_material_id) def getRootMaterialIDForDiameter(self, root_material_id: str, approximate_diameter: str) -> str: - return self._material_diameter_map.get(root_material_id, {}).get(approximate_diameter, root_material_id) + original_material = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(id=root_material_id)[0] + if original_material["approximate_diameter"] == approximate_diameter: + return root_material_id + + matching_materials = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(type = "material", brand = original_material["brand"], definition = original_material["definition"], material = original_material["material"], color_name = original_material["color_name"]) + for material in matching_materials: + if material["approximate_diameter"] == approximate_diameter: + return material["id"] + return root_material_id def getRootMaterialIDWithoutDiameter(self, root_material_id: str) -> str: return self._diameter_material_map.get(root_material_id, "") From dc26f98a3ade105d853e51b05f99eb043553e9b7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 11:30:04 +0200 Subject: [PATCH 176/994] Fix import issue CURA-6600 --- cura/Settings/ContainerManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 1438faee96..d8f758d8a0 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -21,14 +21,14 @@ from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.InstanceContainer import InstanceContainer import cura.CuraApplication - +from cura.Machines.MaterialManager import MaterialManager if TYPE_CHECKING: from cura.CuraApplication import CuraApplication from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup - from cura.Machines.MaterialManager import MaterialManager + from cura.Machines.QualityManager import QualityManager catalog = i18nCatalog("cura") From 2417705dfd6f99ebcaa4d7516ebfc4367fd155cb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 11:42:52 +0200 Subject: [PATCH 177/994] Prevent crashes when duplicating a material CURA-6600 --- cura/Machines/VariantManager.py | 2 +- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index c80545145f..9c074dcf17 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -115,7 +115,7 @@ class VariantManager: variant_type: Optional["VariantType"] = None) -> Optional["ContainerNode"]: if variant_type is None: variant_node = None - variant_type_dict = self._machine_to_variant_dict_map[machine_definition_id] + variant_type_dict = self._machine_to_variant_dict_map.get("machine_definition_id", {}) for variant_dict in variant_type_dict.values(): if variant_name in variant_dict: variant_node = variant_dict[variant_name] diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 2ab9e701eb..157d871d54 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -244,7 +244,10 @@ class XmlMaterialProfile(InstanceContainer): variant_name = container.getMetaDataEntry("variant_name") if variant_name: - variant_dict = {"variant_node": variant_manager.getVariantNode(definition_id, variant_name), + variant_node = variant_manager.getVariantNode(definition_id, variant_name) + if variant_node is None: + continue + variant_dict = {"variant_node":variant_node , "material_container": container} machine_variant_map[definition_id][variant_name] = variant_dict continue From 8759aae73e0664766205c36589fba169d17072af Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 12:47:07 +0200 Subject: [PATCH 178/994] Fix crash when materialManager could not be converted to QObject No idea why this was causing issues, but this should also be a bit faster. CURA-6600 --- resources/qml/Preferences/Materials/MaterialsPage.qml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index a0ce3c4b49..481a256501 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -17,6 +17,8 @@ Item property var resetEnabled: false property var currentItem: null + property var materialManager: CuraApplication.getMaterialManager() + property var hasCurrentItem: base.currentItem != null property var isCurrentItemActivated: { @@ -119,7 +121,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = CuraApplication.getMaterialManager().createMaterial(); + base.newRootMaterialIdToSwitchTo = base.materialManager.createMaterial(); base.toActivateNewMaterial = true; } } @@ -134,7 +136,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = CuraApplication.getMaterialManager().duplicateMaterial(base.currentItem.container_node); + base.newRootMaterialIdToSwitchTo = base.materialManager.duplicateMaterial(base.currentItem.container_node); base.toActivateNewMaterial = true; } } @@ -145,7 +147,8 @@ Item id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" - enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && CuraApplication.getMaterialManager().canMaterialBeRemoved(base.currentItem.container_node) + enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManager.canMaterialBeRemoved(base.currentItem.container_node) + onClicked: { forceActiveFocus(); @@ -294,7 +297,7 @@ Item { // Set the active material as the fallback. It will be selected when the current material is deleted base.newRootMaterialIdToSwitchTo = base.active_root_material_id - CuraApplication.getMaterialManager().removeMaterial(base.currentItem.container_node); + base.materialManager.removeMaterial(base.currentItem.container_node); } } From 49e8c8d9d97df9e7a5281a736e644d2944abc43e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 12:52:31 +0200 Subject: [PATCH 179/994] Fix the check to see if a material can be removed CURA-6600 --- cura/Machines/MaterialManager.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 09416d1704..87245b5d53 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -262,12 +262,7 @@ class MaterialManager(QObject): # In the future we might enable this again, but right now, it's causing a ton of issues if we do (since it # corrupts the configuration) root_material_id = material_node.getMetaDataEntry("base_file") - material_group = self.getMaterialGroup(root_material_id) - if not material_group: - return False - - nodes_to_remove = [material_group.root_material_node] + material_group.derived_material_node_list - ids_to_remove = [node.getMetaDataEntry("id", "") for node in nodes_to_remove] + ids_to_remove = [metadata.get("id", "") for metadata in CuraContainerRegistry.getInstance().findInstanceContainersMetadata(base_file=root_material_id)] for extruder_stack in CuraContainerRegistry.getInstance().findContainerStacks(type = "extruder_train"): if extruder_stack.material.getId() in ids_to_remove: From 646222f2acd596167429254eb3cb194f5284881a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 13:01:05 +0200 Subject: [PATCH 180/994] Fix removing of material CURA-6600 --- cura/Machines/MaterialManager.py | 6 ------ cura/Machines/Models/BaseMaterialsModel.py | 5 ++++- cura/Machines/Models/FavoriteMaterialsModel.py | 3 ++- cura/Machines/Models/GenericMaterialsModel.py | 5 +++-- cura/Machines/Models/MaterialBrandsModel.py | 3 ++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 87245b5d53..a360cf883a 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -253,9 +253,6 @@ class MaterialManager(QObject): for result in results: container_registry.removeContainer(result.getMetaDataEntry("id", "")) - # - # Methods for GUI - # @pyqtSlot("QVariant", result=bool) def canMaterialBeRemoved(self, material_node: "MaterialNode"): # Check if the material is active in any extruder train. In that case, the material shouldn't be removed! @@ -284,9 +281,6 @@ class MaterialManager(QObject): if container: container.setName(name) - # - # Removes the given material. - # @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: root_material_id = material_node.getMetaDataEntry("base_file") diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index cd8fc70dbd..97226b6bd6 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -128,7 +128,10 @@ class BaseMaterialsModel(ListModel): ## This is another convenience function which is shared by all material # models so it's put here to avoid having so much duplicated code. def _createMaterialItem(self, root_material_id, container_node): - metadata = CuraContainerRegistry.getInstance().findContainersMetadata(id = container_node.container_id)[0] + metadata_list = CuraContainerRegistry.getInstance().findContainersMetadata(id = container_node.container_id) + if not metadata_list: + return None + metadata = metadata_list[0] item = { "root_material_id": root_material_id, "id": metadata["id"], diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index dda06a953a..5f42a17f46 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -28,7 +28,8 @@ class FavoriteMaterialsModel(BaseMaterialsModel): continue item = self._createMaterialItem(root_material_id, container_node) - item_list.append(item) + if item: + item_list.append(item) # Sort the item list alphabetically by name item_list = sorted(item_list, key = lambda d: d["brand"].upper()) diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index 8a03dcfdeb..78d3641652 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -24,11 +24,12 @@ class GenericMaterialsModel(BaseMaterialsModel): continue # Only add results for generic materials - if container_node.getMetaDataEntry("brand").lower() != "generic": + if container_node.getMetaDataEntry("brand", "unknown").lower() != "generic": continue item = self._createMaterialItem(root_material_id, container_node) - item_list.append(item) + if item: + item_list.append(item) # Sort the item list alphabetically by name item_list = sorted(item_list, key = lambda d: d["name"].upper()) diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index c4721db5f7..85167632af 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -55,7 +55,8 @@ class MaterialBrandsModel(BaseMaterialsModel): # Now handle the individual materials item = self._createMaterialItem(root_material_id, container_node) - brand_group_dict[brand][material_type].append(item) + if item: + brand_group_dict[brand][material_type].append(item) # Part 2: Organize the tree into models # From 88857a7be8150c60784399a9e8c211a9e3c66c43 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 13:06:09 +0200 Subject: [PATCH 181/994] Fix setMaterialName CURA-6600 --- cura/Machines/MaterialManager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index a360cf883a..4614344db6 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -274,12 +274,8 @@ class MaterialManager(QObject): if CuraContainerRegistry.getInstance().isReadOnly(root_material_id): Logger.log("w", "Cannot set name of read-only container %s.", root_material_id) return - - material_group = self.getMaterialGroup(root_material_id) - if material_group: - container = material_group.root_material_node.container - if container: - container.setName(name) + containers = CuraContainerRegistry.getInstance().findInstanceContainers(id = root_material_id) + containers[0].setName(name) @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: From fcbfa88d97fdf7fa42fa7bfad6287ca88ff8abc6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 13:13:08 +0200 Subject: [PATCH 182/994] Fix creation of new materials CURA-6600 --- cura/Machines/MaterialManager.py | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 4614344db6..0c90d36428 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -283,14 +283,7 @@ class MaterialManager(QObject): if root_material_id is not None: self.removeMaterialByRootId(root_material_id) - # - # Creates a duplicate of a material, which has the same GUID and base_file metadata. - # Returns the root material ID of the duplicated material if successful. - # - @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: - root_material_id = cast(str, material_node.getMetaDataEntry("base_file", "")) - + def duplicateMaterialByRootId(self, root_material_id, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: container_registry = CuraContainerRegistry.getInstance() results = container_registry.findContainers(id=root_material_id) @@ -317,7 +310,7 @@ class MaterialManager(QObject): new_containers.append(new_base_container) # Clone all of them. - for container_to_copy in container_registry.findContainers(base_file= root_material_id): + for container_to_copy in container_registry.findContainers(base_file=root_material_id): if container_to_copy.getId() == root_material_id: continue # We already have that one, skip it new_id = new_base_id @@ -344,8 +337,15 @@ class MaterialManager(QObject): self.addFavorite(new_base_id) return new_base_id - # + # Creates a duplicate of a material, which has the same GUID and base_file metadata. + # Returns the root material ID of the duplicated material if successful. + # + @pyqtSlot("QVariant", result = str) + def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + root_material_id = cast(str, material_node.getMetaDataEntry("base_file", "")) + return self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) + # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. # Returns the ID of the newly created material. @pyqtSlot(result = str) @@ -364,11 +364,6 @@ class MaterialManager(QObject): approximate_diameter = str(extruder_stack.approximateMaterialDiameter) root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_diameter) - material_group = self.getMaterialGroup(root_material_id) - - if not material_group: # This should never happen - Logger.log("w", "Cannot get the material group of %s.", root_material_id) - return "" # Create a new ID & container to hold the data. new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material") @@ -377,9 +372,7 @@ class MaterialManager(QObject): "GUID": str(uuid.uuid4()), } - self.duplicateMaterial(material_group.root_material_node, - new_base_id = new_id, - new_metadata = new_metadata) + self.duplicateMaterialByRootId(root_material_id, new_base_id = new_id, new_metadata = new_metadata) return new_id @pyqtSlot(str) From d29b3078b3c46dfdbd12b2108ed18ed10ca948b0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 13:15:38 +0200 Subject: [PATCH 183/994] Clean up no longer used code CURA-6600 --- cura/Machines/MaterialManager.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 0c90d36428..94e7274380 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -59,15 +59,6 @@ class MaterialManager(QObject): # Root_material_id -> MaterialGroup self._material_group_map = dict() # type: Dict[str, MaterialGroup] - # Approximate diameter str - self._diameter_machine_nozzle_buildplate_material_map = dict() # type: Dict[str, Dict[str, MaterialNode]] - - # We're using these two maps to convert between the specific diameter material id and the generic material id - # because the generic material ids are used in qualities and definitions, while the specific diameter material is meant - # i.e. generic_pla -> generic_pla_175 - # root_material_id -> approximate diameter str -> root_material_id for that diameter - self._material_diameter_map = defaultdict(dict) # type: Dict[str, Dict[str, str]] - # Material id including diameter (generic_pla_175) -> material root id (generic_pla) self._diameter_material_map = dict() # type: Dict[str, str] @@ -75,11 +66,6 @@ class MaterialManager(QObject): # GUID -> a list of material_groups self._guid_material_groups_map = defaultdict(list) # type: Dict[str, List[MaterialGroup]] - # The machine definition ID for the non-machine-specific materials. - # This is used as the last fallback option if the given machine-specific material(s) cannot be found. - self._default_machine_definition_id = "fdmprinter" - self._default_approximate_diameter_for_quality_search = "3" - self._favorites = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) self.materialsUpdated.emit() From 4ff8991196e13dde708164df86a8003fb9cea7d8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 14:10:36 +0200 Subject: [PATCH 184/994] Ensure that materials get filtered by diameter again CURA-6600 --- cura/Machines/MaterialManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 94e7274380..51553f87c9 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -109,7 +109,10 @@ class MaterialManager(QObject): nozzle_name = extruder_stack.variant.getName() # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. - return self.getAvailableMaterials(machine.definition.getId(), nozzle_name) + materials =self.getAvailableMaterials(machine.definition.getId(), nozzle_name) + compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) + + return {key: material for key, material in materials.items() if material.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} # # Gets MaterialNode for the given extruder and machine with the given material name. From 38937d8ac44f545ec09de0708ed041b708363d6e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 14:47:08 +0200 Subject: [PATCH 185/994] Remove material node when material is deleted Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 31a73f9e2f..13e63b70ff 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -4,6 +4,7 @@ from typing import TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode @@ -19,9 +20,11 @@ class MaterialNode(ContainerNode): super().__init__(container_id) self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. - my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = container_id)[0] + container_registry = ContainerRegistry.getInstance() + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] self.base_file = my_metadata["base_file"] self._loadAll() + container_registry.containerRemoved.connect(self._onRemoved) def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() @@ -44,4 +47,13 @@ class MaterialNode(ContainerNode): for quality in qualities: quality_id = quality["id"] if quality_id not in self.qualities: - self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file + self.qualities[quality_id] = QualityNode(quality_id, parent = self) + + ## Triggered when any container is removed, but only handles it when the + # container is removed that this node represents. + # \param container The container that was allegedly removed. + def _onRemoved(self, container: ContainerInterface) -> None: + if container.getId() == self.container_id: + # Remove myself from my parent. + if self.base_file in self.variant.materials: + del self.variant.materials[self.base_file] \ No newline at end of file From 41c573b0875cd944fffed05565b04b5839cef528 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 15:06:02 +0200 Subject: [PATCH 186/994] Fix filtering by GUID Get the correct metadata entry, please. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 13e63b70ff..cae88a6730 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -40,7 +40,7 @@ class MaterialNode(ContainerNode): for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) if not qualities: # No quality profiles found. Go by GUID then. - my_guid = my_metadata.get("material") + my_guid = my_metadata.get("guid") for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) From 30b2f943fdad0d4c2248a0b735815a19b334c2b7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 15:13:19 +0200 Subject: [PATCH 187/994] Update material node when its metadata changes This should keep the tree up to date if anything is added, removed or changed in the container registry. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 38 ++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index cae88a6730..5148007c7d 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import Any, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface @@ -23,8 +23,11 @@ class MaterialNode(ContainerNode): container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] self.base_file = my_metadata["base_file"] + self.material_type = my_metadata["material"] + self.guid = my_metadata["guid"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) + container_registry.containerMetaDataChanged(self._onMetadataChanged) def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() @@ -33,14 +36,13 @@ class MaterialNode(ContainerNode): qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") else: # Need to find the qualities that specify a material profile with the same material type. - my_metadata = container_registry.findInstanceContainersMetadata(id = self.container_id)[0] - my_material_type = my_metadata.get("material") + my_material_type = self.material_type qualities = [] qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) if not qualities: # No quality profiles found. Go by GUID then. - my_guid = my_metadata.get("guid") + my_guid = self.guid for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) @@ -56,4 +58,30 @@ class MaterialNode(ContainerNode): if container.getId() == self.container_id: # Remove myself from my parent. if self.base_file in self.variant.materials: - del self.variant.materials[self.base_file] \ No newline at end of file + del self.variant.materials[self.base_file] + + ## Triggered when any metadata changed in any container, but only handles + # it when the metadata of this node is changed. + # \param container The container whose metadata changed. + # \param kwargs Key-word arguments provided when changing the metadata. + # These are ignored. As far as I know they are never provided to this + # call. + def _onMetadataChanged(self, container: ContainerInterface, **kwargs: Any) -> None: + if container.getId() != self.container_id: + return + + new_metadata = container.getMetaData() + old_base_file = self.base_file + if new_metadata["base_file"] != old_base_file: + self.base_file = new_metadata["base_file"] + if old_base_file in self.variant.materials: # Move in parent node. + del self.variant.materials[old_base_file] + self.variant.materials[self.base_file] = self + + old_material_type = self.material_type + self.material_type = new_metadata["material"] + old_guid = self.guid + self.guid = new_metadata["guid"] + if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. + self.qualities = {} + self._loadAll() # Re-load the quality profiles for this node. \ No newline at end of file From b0e6bb4bc9fcc745fd549b3062407c5105b48b91 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 15:33:07 +0200 Subject: [PATCH 188/994] Update documentation for getLinkedMaterials Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index d8f758d8a0..8d13dc7b48 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -323,10 +323,13 @@ class ContainerManager(QObject): ## Get a list of materials that have the same GUID as the reference material # - # \param material_id \type{str} the id of the material for which to get the linked materials. - # \return \type{list} a list of names of materials with the same GUID + # \param material_node The node representing the material for which to get + # the same GUID. + # \param exclude_self Whether to include the name of the material you + # provided. + # \return A list of names of materials with the same GUID @pyqtSlot("QVariant", bool, result = "QStringList") - def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False): + def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]: guid = material_node.getMetaDataEntry("GUID", "") self_root_material_id = material_node.getMetaDataEntry("base_file") From ae7c71763626a9866e9b712070c1deaa6bf6a7e2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 15:40:29 +0200 Subject: [PATCH 189/994] Re-implement getLinkedMaterials without material manager Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 8d13dc7b48..4edddb9d83 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -9,7 +9,6 @@ from typing import Dict, Union, Any, TYPE_CHECKING, List from PyQt5.QtCore import QObject, QUrl from PyQt5.QtWidgets import QMessageBox - from UM.i18n import i18nCatalog from UM.FlameProfiler import pyqtSlot from UM.Logger import Logger @@ -17,6 +16,7 @@ from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError from UM.Platform import Platform from UM.SaveFile import SaveFile from UM.Settings.ContainerFormatError import ContainerFormatError +from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.InstanceContainer import InstanceContainer @@ -327,21 +327,14 @@ class ContainerManager(QObject): # the same GUID. # \param exclude_self Whether to include the name of the material you # provided. - # \return A list of names of materials with the same GUID + # \return A list of names of materials with the same GUID. @pyqtSlot("QVariant", bool, result = "QStringList") def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]: - guid = material_node.getMetaDataEntry("GUID", "") - - self_root_material_id = material_node.getMetaDataEntry("base_file") - material_group_list = MaterialManager.getInstance().getMaterialGroupListByGUID(guid) - - linked_material_names = [] - if material_group_list: - for material_group in material_group_list: - if exclude_self and material_group.name == self_root_material_id: - continue - linked_material_names.append(material_group.root_material_node.getMetaDataEntry("name", "")) - return linked_material_names + same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(guid = material_node.guid) + if exclude_self: + return [metadata["name"] for metadata in same_guid if metadata["base_file"] != material_node.base_file] + else: + return [metadata["name"] for metadata in same_guid] ## Unlink a material from all other materials by creating a new GUID # \param material_id \type{str} the id of the material to create a new GUID for. From 443495973f43416fedd56ef2f7e761771f920af5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 16:16:28 +0200 Subject: [PATCH 190/994] Don't use deprecated material manager any more Contributes to issue CURA-6600. --- .../ClusterPrinterConfigurationMaterial.py | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index aea244b31d..143824facd 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -1,8 +1,9 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from typing import Optional -from cura.CuraApplication import CuraApplication +from UM.Settings.ContainerRegistry import ContainerRegistry from cura.PrinterOutput.Models.MaterialOutputModel import MaterialOutputModel from ..BaseModel import BaseModel @@ -24,32 +25,27 @@ class ClusterPrinterConfigurationMaterial(BaseModel): self.material = material super().__init__(**kwargs) - ## Creates a material output model based on this cloud printer material. + ## Creates a material output model based on this cloud printer material. + # + # A material is chosen that matches the current GUID. If multiple such + # materials are available, read-only materials are preferred and the + # material with the earliest alphabetical name will be selected. + # \return A material output model that matches the current GUID. def createOutputModel(self) -> MaterialOutputModel: - material_manager = CuraApplication.getInstance().getMaterialManager() - material_group_list = material_manager.getMaterialGroupListByGUID(self.guid) or [] - - # Sort the material groups by "is_read_only = True" first, and then the name alphabetically. - read_only_material_group_list = list(filter(lambda x: x.is_read_only, material_group_list)) - non_read_only_material_group_list = list(filter(lambda x: not x.is_read_only, material_group_list)) - material_group = None - if read_only_material_group_list: - read_only_material_group_list = sorted(read_only_material_group_list, key = lambda x: x.name) - material_group = read_only_material_group_list[0] - elif non_read_only_material_group_list: - non_read_only_material_group_list = sorted(non_read_only_material_group_list, key = lambda x: x.name) - material_group = non_read_only_material_group_list[0] - - if material_group: - container = material_group.root_material_node.container - color = container.getMetaDataEntry("color_code") - brand = container.getMetaDataEntry("brand") - material_type = container.getMetaDataEntry("material") - name = container.getName() + container_registry = ContainerRegistry.getInstance() + same_guid = container_registry.findInstanceContainersMetadata(guid = self.guid) + if same_guid: + read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"]) + if read_only: + material_metadata = read_only[0] + else: + material_metadata = min(same_guid, key = lambda metadata: metadata["name"]) else: - color = self.color - brand = self.brand - material_type = self.material - name = "Empty" if self.material == "empty" else "Unknown" + material_metadata = { + "color_code": self.color, + "brand": self.brand, + "material": self.material, + "name": "Empty" if self.material == "empty" else "Unknown" + } - return MaterialOutputModel(guid=self.guid, type=material_type, brand=brand, color=color, name=name) + return MaterialOutputModel(guid = self.guid, type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata["color_code"], name = material_metadata["name"]) From 10dbf3f7350989c259730ace2f5af29201f8da53 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 16:24:00 +0200 Subject: [PATCH 191/994] Fix getting GUID from metadata I keep making this mistake. A donkey may not hit its leg twice on the same stone, but I ain't no ass. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 5148007c7d..9631354243 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -24,7 +24,7 @@ class MaterialNode(ContainerNode): my_metadata = container_registry.findContainersMetadata(id = container_id)[0] self.base_file = my_metadata["base_file"] self.material_type = my_metadata["material"] - self.guid = my_metadata["guid"] + self.guid = my_metadata["GUID"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) container_registry.containerMetaDataChanged(self._onMetadataChanged) @@ -81,7 +81,7 @@ class MaterialNode(ContainerNode): old_material_type = self.material_type self.material_type = new_metadata["material"] old_guid = self.guid - self.guid = new_metadata["guid"] + self.guid = new_metadata["GUID"] if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. self.qualities = {} self._loadAll() # Re-load the quality profiles for this node. \ No newline at end of file From 04c53c7190f24e0b570673499a569d6fece13487 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 16:24:27 +0200 Subject: [PATCH 192/994] Fix connecting to metadata changes Otherwise the number of parameters is wrong. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 9631354243..9421448287 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -27,7 +27,7 @@ class MaterialNode(ContainerNode): self.guid = my_metadata["GUID"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) - container_registry.containerMetaDataChanged(self._onMetadataChanged) + container_registry.containerMetaDataChanged.connect(self._onMetadataChanged) def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() From dcf7ed99695e0e395d635d0d882d17d2b0d4b643 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 16:38:59 +0200 Subject: [PATCH 193/994] Fix finding materials by GUID See, I made the mistake again. Contributes to issue CURA-6600. --- .../src/Models/Http/ClusterPrinterConfigurationMaterial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index 143824facd..8edb9fb808 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -33,7 +33,7 @@ class ClusterPrinterConfigurationMaterial(BaseModel): # \return A material output model that matches the current GUID. def createOutputModel(self) -> MaterialOutputModel: container_registry = ContainerRegistry.getInstance() - same_guid = container_registry.findInstanceContainersMetadata(guid = self.guid) + same_guid = container_registry.findInstanceContainersMetadata(GUID = self.guid) if same_guid: read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"]) if read_only: From 5abb03e269bf4aedde03f8f93ce513eff5fdd710 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 17:09:16 +0200 Subject: [PATCH 194/994] No longer update all material models when favourites change The MaterialManager.materialsUpdated signal was only called once upon init and for the rest when a favourite was added or removed. So only the FavoriteMaterialsModel would need to listen to it. Because the MaterialManager is being deprecated, the favourite materials model now just listens to the preferences changing instead, as it was supposed to be doing anyway. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 3 --- cura/Machines/Models/FavoriteMaterialsModel.py | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 97226b6bd6..ee869b17b8 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -34,9 +34,6 @@ class BaseMaterialsModel(ListModel): # Update this model when switching machines self._machine_manager.activeStackChanged.connect(self._update) - - # Update this model when list of materials changes - self._material_manager.materialsUpdated.connect(self._update) self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index 5f42a17f46..bab0809ee0 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -2,11 +2,20 @@ # Cura is released under the terms of the LGPLv3 or higher. from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel +import cura.CuraApplication # To listen to changes to the preferences. ## Model that shows the list of favorite materials. class FavoriteMaterialsModel(BaseMaterialsModel): def __init__(self, parent = None): super().__init__(parent) + cura.CuraApplication.CuraApplication.getInstance().getPreferences().preferenceChanged.connect(self._onFavoritesChanged) + self._update() + + ## Triggered when any preference changes, but only handles it when the list + # of favourites is changed. + def _onFavoritesChanged(self, preference_key: str) -> None: + if preference_key != "cura/favorite_materials": + return self._update() def _update(self): From 46b489c3f99ccc9d0eb713831ab794653b623b7d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 19 Aug 2019 17:32:39 +0200 Subject: [PATCH 195/994] getAvailableMaterialsForMachineExtruder can never return None So no need to check for it. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 2 +- cura/Machines/Models/BaseMaterialsModel.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 51553f87c9..4790314b25 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -103,7 +103,7 @@ class MaterialManager(QObject): # A convenience function to get available materials for the given machine with the extruder position. # def getAvailableMaterialsForMachineExtruder(self, machine: "GlobalStack", - extruder_stack: "ExtruderStack") -> Optional[Dict[str, MaterialNode]]: + extruder_stack: "ExtruderStack") -> Dict[str, MaterialNode]: nozzle_name = None if extruder_stack.variant.getId() != "empty_variant": nozzle_name = extruder_stack.variant.getName() diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index ee869b17b8..188ce1791b 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -106,20 +106,15 @@ class BaseMaterialsModel(ListModel): # so it's placed here for easy access. def _canUpdate(self): global_stack = self._machine_manager.activeMachine - if global_stack is None or not self._enabled: return False extruder_position = str(self._extruder_position) - if extruder_position not in global_stack.extruders: return False - extruder_stack = global_stack.extruders[extruder_position] - self._available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) - if self._available_materials is None: - return False + self._available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) return True ## This is another convenience function which is shared by all material From b5d826fab946d6b7ba4dbcab9a51e2502738ada8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 20 Aug 2019 14:49:47 +0200 Subject: [PATCH 196/994] Fix deprecation warning CURA-6600 --- cura/Machines/ContainerNode.py | 1 + cura/Machines/MaterialManager.py | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 32ebe203a3..74d08dff6c 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -24,6 +24,7 @@ class ContainerNode: self.children_map = {} # type: Dict[str, ContainerNode] # Mapping from container ID to container node. ## Gets the metadata of the container that this node represents. + # Getting the metadata from the container directly is about 10x as fast. # \return The metadata of the container in this node. @deprecated("Get the metadata from the container with the ID of this node yourself.", "4.3") def getMetadata(self): diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 4790314b25..72862d43f0 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -1,6 +1,5 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - from collections import defaultdict import copy import uuid @@ -109,10 +108,10 @@ class MaterialManager(QObject): nozzle_name = extruder_stack.variant.getName() # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. - materials =self.getAvailableMaterials(machine.definition.getId(), nozzle_name) + materials = self.getAvailableMaterials(machine.definition.getId(), nozzle_name) compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) - - return {key: material for key, material in materials.items() if material.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + result = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + return result # # Gets MaterialNode for the given extruder and machine with the given material name. From 507cb356d2d84ce655845960b3efc977a5fe7761 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 20 Aug 2019 15:38:45 +0200 Subject: [PATCH 197/994] Remove (all?, most?) deprecated ContainerNode.getMetaDataEntry calls. part of CURA-6600 --- cura/Machines/MachineNode.py | 2 +- cura/Machines/MaterialManager.py | 8 ++++---- cura/Machines/Models/FavoriteMaterialsModel.py | 2 +- cura/Machines/Models/GenericMaterialsModel.py | 4 ++-- cura/Machines/Models/MaterialBrandsModel.py | 6 +++--- cura/Machines/QualityChangesGroup.py | 4 ++-- cura/Machines/QualityGroup.py | 4 ++-- cura/Machines/QualityManager.py | 2 +- cura/Settings/ContainerManager.py | 6 +++--- cura/Settings/IntentManager.py | 6 +++--- cura/Settings/MachineManager.py | 2 +- tests/TestMaterialManager.py | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index f0a001b2d6..567ec1deab 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -70,7 +70,7 @@ class MachineNode(ContainerNode): # Create the quality group for each available type. quality_groups = {} for quality_type, global_quality_node in self.global_qualities.items(): - quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in qualities_per_type_per_extruder: quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 4790314b25..44559b27d8 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -247,7 +247,7 @@ class MaterialManager(QObject): # Check if the material is active in any extruder train. In that case, the material shouldn't be removed! # In the future we might enable this again, but right now, it's causing a ton of issues if we do (since it # corrupts the configuration) - root_material_id = material_node.getMetaDataEntry("base_file") + root_material_id = material_node.container.getMetaDataEntry("base_file") ids_to_remove = [metadata.get("id", "") for metadata in CuraContainerRegistry.getInstance().findInstanceContainersMetadata(base_file=root_material_id)] for extruder_stack in CuraContainerRegistry.getInstance().findContainerStacks(type = "extruder_train"): @@ -257,7 +257,7 @@ class MaterialManager(QObject): @pyqtSlot("QVariant", str) def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: - root_material_id = material_node.getMetaDataEntry("base_file") + root_material_id = material_node.container.getMetaDataEntry("base_file") if root_material_id is None: return if CuraContainerRegistry.getInstance().isReadOnly(root_material_id): @@ -268,7 +268,7 @@ class MaterialManager(QObject): @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: - root_material_id = material_node.getMetaDataEntry("base_file") + root_material_id = material_node.container.getMetaDataEntry("base_file") if root_material_id is not None: self.removeMaterialByRootId(root_material_id) @@ -332,7 +332,7 @@ class MaterialManager(QObject): # @pyqtSlot("QVariant", result = str) def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: - root_material_id = cast(str, material_node.getMetaDataEntry("base_file", "")) + root_material_id = cast(str, material_node.container.getMetaDataEntry("base_file", "")) return self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index bab0809ee0..bab6df6260 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -29,7 +29,7 @@ class FavoriteMaterialsModel(BaseMaterialsModel): for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.getMetaDataEntry("removed", False)): + if bool(container_node.container.getMetaDataEntry("removed", False)): continue # Only add results for favorite materials diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index 78d3641652..f5edc22051 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -20,11 +20,11 @@ class GenericMaterialsModel(BaseMaterialsModel): for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.getMetaDataEntry("removed", False)): + if bool(container_node.container.getMetaDataEntry("removed", False)): continue # Only add results for generic materials - if container_node.getMetaDataEntry("brand", "unknown").lower() != "generic": + if container_node.container.getMetaDataEntry("brand", "unknown").lower() != "generic": continue item = self._createMaterialItem(root_material_id, container_node) diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index 85167632af..8bb5217fe7 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -38,18 +38,18 @@ class MaterialBrandsModel(BaseMaterialsModel): # Part 1: Generate the entire tree of brands -> material types -> spcific materials for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.getMetaDataEntry("removed", False)): + if bool(container_node.container.getMetaDataEntry("removed", False)): continue # Add brands we haven't seen yet to the dict, skipping generics - brand = container_node.getMetaDataEntry("brand", "") + brand = container_node.container.getMetaDataEntry("brand", "") if brand.lower() == "generic": continue if brand not in brand_group_dict: brand_group_dict[brand] = {} # Add material types we haven't seen yet to the dict - material_type = container_node.getMetaDataEntry("material", "") + material_type = container_node.container.getMetaDataEntry("material", "") if material_type not in brand_group_dict[brand]: brand_group_dict[brand][material_type] = [] diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 7844b935dc..16e3e08c81 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -18,10 +18,10 @@ class QualityChangesGroup(QualityGroup): self._container_registry = Application.getInstance().getContainerRegistry() def addNode(self, node: "QualityNode") -> None: - extruder_position = node.getMetaDataEntry("position") + extruder_position = node.container.getMetaDataEntry("position") if extruder_position is None and self.node_for_global is not None or extruder_position in self.nodes_for_extruders: #We would be overwriting another node. - ConfigurationErrorMessage.getInstance().addFaultyContainers(node.getMetaDataEntry("id")) + ConfigurationErrorMessage.getInstance().addFaultyContainers(node.container_id) return if extruder_position is None: # Then we're a global quality changes profile. diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 4eb68a04af..a4324e069d 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -60,12 +60,12 @@ class QualityGroup(QObject): self.node_for_global = node # Update is_experimental flag - is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False)) + is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental def setExtruderNode(self, position: int, node: "ContainerNode") -> None: self.nodes_for_extruders[position] = node # Update is_experimental flag - is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False)) + is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 57bcaa9c70..e0364ba172 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -165,7 +165,7 @@ class QualityManager(QObject): Logger.log("i", "Removing quality changes group [%s]", quality_changes_group.name) removed_quality_changes_ids = set() for node in quality_changes_group.getAllNodes(): - container_id = node.getMetaDataEntry("id") + container_id = node.container_id self._container_registry.removeContainer(container_id) removed_quality_changes_ids.add(container_id) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 4edddb9d83..a4c75353f5 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -83,7 +83,7 @@ class ContainerManager(QObject): # Update: In order for QML to use objects and sub objects, those (sub) objects must all be QObject. Is that what we want? @pyqtSlot("QVariant", str, str) def setContainerMetaDataEntry(self, container_node: "ContainerNode", entry_name: str, entry_value: str) -> bool: - root_material_id = container_node.getMetaDataEntry("base_file", "") + root_material_id = container_node.container.getMetaDataEntry("base_file", "") if cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) return False @@ -99,7 +99,7 @@ class ContainerManager(QObject): sub_item_changed = False if entries: root_name = entries.pop(0) - root = material_group.root_material_node.getMetaDataEntry(root_name) + root = material_group.root_material_node.container.getMetaDataEntry(root_name) item = root for _ in range(len(entries)): @@ -341,7 +341,7 @@ class ContainerManager(QObject): @pyqtSlot("QVariant") def unlinkMaterial(self, material_node: "MaterialNode") -> None: # Get the material group - material_group = MaterialManager.getInstance().getMaterialGroup(material_node.getMetaDataEntry("base_file", "")) + material_group = MaterialManager.getInstance().getMaterialGroup(material_node.container.getMetaDataEntry("base_file", "")) if material_group is None: Logger.log("w", "Unable to find material group for %s", material_node) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 2cfbf11ae2..251cf0aed8 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -81,7 +81,7 @@ class IntentManager(QObject): available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} final_intent_ids = set() # type: Set[str] - current_definition_id = global_stack.definition.getMetaDataEntry("id") + current_definition_id = global_stack.definition.getId() for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") @@ -106,7 +106,7 @@ class IntentManager(QObject): global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return ["default"] - current_definition_id = global_stack.definition.getMetaDataEntry("id") + current_definition_id = global_stack.definition.getId() final_intent_categories = set() # type: Set[str] for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") @@ -136,7 +136,7 @@ class IntentManager(QObject): global_stack = application.getGlobalContainerStack() if global_stack is None: return - current_definition_id = global_stack.definition.getMetaDataEntry("id") + current_definition_id = global_stack.definition.getId() for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 772c942d0f..aaf9500eba 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1254,7 +1254,7 @@ class MachineManager(QObject): return if material_node: self._global_container_stack.extruders[position].material = CuraContainerRegistry.getInstance().findContainers(id = material_node.container_id)[0] - root_material_id = material_node.getMetaDataEntry("base_file", None) + root_material_id = material_node.container.getMetaDataEntry("base_file", None) else: self._global_container_stack.extruders[position].material = empty_material_container root_material_id = None diff --git a/tests/TestMaterialManager.py b/tests/TestMaterialManager.py index 21ec44972c..d87ab3a63e 100644 --- a/tests/TestMaterialManager.py +++ b/tests/TestMaterialManager.py @@ -137,7 +137,7 @@ def test_getMaterialNode(application): manager = MaterialManager(mocked_registry) manager._updateMaps() - assert manager.getMaterialNode("fdmmachine", None, None, 3, "base_material").getMetaDataEntry("id") == "test" + assert manager.getMaterialNode("fdmmachine", None, None, 3, "base_material").container_id == "test" def test_getAvailableMaterialsForMachineExtruder(application): From 47d082b5dcaeda869c2fb16bd80b34158efa075e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 09:42:49 +0200 Subject: [PATCH 198/994] Fix updating of material models CURA-6600 --- cura/Machines/MaterialManager.py | 24 ++++++++++++++++++++++ cura/Machines/Models/BaseMaterialsModel.py | 1 + 2 files changed, 25 insertions(+) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 72862d43f0..2ea03701db 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -10,6 +10,7 @@ from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Decorators import deprecated from UM.Logger import Logger +from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.SettingFunction import SettingFunction from UM.Util import parseBool import cura.CuraApplication #Imported like this to prevent circular imports. @@ -68,6 +69,29 @@ class MaterialManager(QObject): self._favorites = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) self.materialsUpdated.emit() + self._update_timer = QTimer(self) + self._update_timer.setInterval(300) + + self._update_timer.setSingleShot(True) + self._update_timer.timeout.connect(self.materialsUpdated) + + container_registry = ContainerRegistry.getInstance() + container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) + container_registry.containerAdded.connect(self._onContainerMetadataChanged) + container_registry.containerRemoved.connect(self._onContainerMetadataChanged) + + def _onContainerMetadataChanged(self, container): + self._onContainerChanged(container) + + def _onContainerChanged(self, container): + container_type = container.getMetaDataEntry("type") + if container_type != "material": + return + + # update the maps + + self._update_timer.start() + def getMaterialGroup(self, root_material_id: str) -> Optional[MaterialGroup]: return self._material_group_map.get(root_material_id) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 188ce1791b..9ee45c7525 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -34,6 +34,7 @@ class BaseMaterialsModel(ListModel): # Update this model when switching machines self._machine_manager.activeStackChanged.connect(self._update) + self._material_manager.materialsUpdated.connect(self._update) self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") From a6be5ac52d4991ce559031b445e1fb0cbfe74ace Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 12:50:40 +0200 Subject: [PATCH 199/994] Fix materialNode tests CURA-6600 --- tests/Machines/TestMaterialNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index f9ea0e3622..1073e97734 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -44,7 +44,7 @@ def getInstanceContainerSideEffect(*args, **kwargs): def container_registry(): result = MagicMock() result.findInstanceContainersMetadata = MagicMock(side_effect=getInstanceContainerSideEffect) - result.findContainersMetadata = MagicMock(return_value = [{"base_file": "material_1"}]) + result.findContainersMetadata = MagicMock(return_value = [{"base_file": "material_1", "material": "test_material_type", "GUID": "omg zomg"}]) return result From 25ea1dd66aa2300790ae136cbc7308f83add9efb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 14:45:59 +0200 Subject: [PATCH 200/994] Add tests for the _onRemoved handler CURA-6600 --- tests/Machines/TestMaterialNode.py | 33 +++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index 1073e97734..33d5905cf9 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -71,4 +71,35 @@ def test_materialNodeInit_MachineQuality(container_registry): assert len(node.qualities) == 2 assert "quality_2" in node.qualities - assert "quality_3" in node.qualities \ No newline at end of file + assert "quality_3" in node.qualities + + +def test_onRemoved_wrongContainer(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + variant_node.materials = {"material_1": MagicMock()} + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance",MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + container = createMockedInstanceContainer("material_2") + node._onRemoved(container) + + assert "material_1" in variant_node.materials + +def test_onRemoved_rightContainer(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance",MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + container = createMockedInstanceContainer("material_1") + variant_node.materials = {"material_1": MagicMock()} + node._onRemoved(container) + + assert "material_1" not in variant_node.materials \ No newline at end of file From f6ccd40f9fade164801b72c62459c9a2911a293b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 15:18:57 +0200 Subject: [PATCH 201/994] Add tests for metadatachanged CURA-6600 --- tests/Machines/TestMaterialNode.py | 49 +++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index 33d5905cf9..b25b348a57 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -89,6 +89,7 @@ def test_onRemoved_wrongContainer(container_registry): assert "material_1" in variant_node.materials + def test_onRemoved_rightContainer(container_registry): variant_node = MagicMock() variant_node.variant_name = "variant_1" @@ -102,4 +103,50 @@ def test_onRemoved_rightContainer(container_registry): variant_node.materials = {"material_1": MagicMock()} node._onRemoved(container) - assert "material_1" not in variant_node.materials \ No newline at end of file + assert "material_1" not in variant_node.materials + + +def test_onMetadataChanged(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + # We only do this now since we do want it to be constructed but not actually re-evaluated. + node._loadAll = MagicMock() + + container = createMockedInstanceContainer("material_1") + container.getMetaData = MagicMock(return_value = {"base_file": "new_base_file", "material": "new_material_type", "GUID": "new_guid"}) + + node._onMetadataChanged(container) + + assert node.material_type == "new_material_type" + assert node.guid == "new_guid" + assert node.base_file == "new_base_file" + + +def test_onMetadataChanged_wrongContainer(container_registry): + variant_node = MagicMock() + variant_node.variant_name = "variant_1" + variant_node.machine.has_machine_quality = True + variant_node.machine.quality_definition = "machine_1" + with patch("cura.Machines.MaterialNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", + MagicMock(return_value=container_registry)): + node = MaterialNode("material_1", variant_node) + + # We only do this now since we do want it to be constructed but not actually re-evaluated. + node._loadAll = MagicMock() + + container = createMockedInstanceContainer("material_2") + container.getMetaData = MagicMock( + return_value={"base_file": "new_base_file", "material": "new_material_type", "GUID": "new_guid"}) + + node._onMetadataChanged(container) + + assert node.material_type == "test_material_type" + assert node.guid == "omg zomg" + assert node.base_file == "material_1" From 7979fcd633500688f24f106f79f8d4c3bc0bc503 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 17:07:58 +0200 Subject: [PATCH 202/994] Fix warnings in the settings menu CURA-6600 --- resources/qml/Menus/SettingsMenu.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 28761866dd..2845101dbf 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -22,7 +22,7 @@ Menu Menu { title: modelData.name - + property var extruder: Cura.MachineManager.getExtruder(model.index) NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index } @@ -41,14 +41,14 @@ Menu { text: catalog.i18nc("@action:inmenu", "Enable Extruder") onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true) - visible: !Cura.MachineManager.getExtruder(model.index).isEnabled + visible: extruder === null ? false : !extruder.isEnabled } MenuItem { text: catalog.i18nc("@action:inmenu", "Disable Extruder") onTriggered: Cura.MachineManager.setExtruderEnabled(index, false) - visible: Cura.MachineManager.getExtruder(model.index).isEnabled + visible: extruder === null ? false : extruder.isEnabled enabled: Cura.MachineManager.numberExtrudersEnabled > 1 } From e7609fadf406efa4a4a42172df117d27cc8e0ebb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 17:08:35 +0200 Subject: [PATCH 203/994] Deprecated the allActiveMaterialIds and replaced the single location where it was used CURA-6600 --- cura/Settings/MachineManager.py | 1 + resources/qml/Menus/MaterialMenu.qml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aaf9500eba..b560d5ec5e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -602,6 +602,7 @@ class MachineManager(QObject): # # \return The material ids in all stacks @pyqtProperty("QVariantMap", notify = activeMaterialChanged) + @deprecated("use Cura.MachineManager.activeStack.extruders instead.", "4.3") def allActiveMaterialIds(self) -> Dict[str, str]: result = {} diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index ba35a160ba..1f85fa33ff 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -14,7 +14,8 @@ Menu property int extruderIndex: 0 property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] - property string activeMaterialId: Cura.MachineManager.allActiveMaterialIds[Cura.ExtruderManager.extruderIds[extruderIndex]] + + property string activeMaterialId: Cura.MachineManager.activeMachine.extruders[extruderIndex].material.id property bool updateModels: true Cura.FavoriteMaterialsModel { From b7213ad02095fed9db906a914c70e97ef40f0a74 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 15:51:27 +0200 Subject: [PATCH 204/994] Don't require material manager any more to find available materials We have our container tree for that. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 9ee45c7525..93d3a9e51f 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -115,7 +115,14 @@ class BaseMaterialsModel(ListModel): return False extruder_stack = global_stack.extruders[extruder_position] - self._available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) + nozzle_name = None + if extruder_stack.variant.getId() != "empty_variant": + nozzle_name = extruder_stack.variant.getName() + + # Update the available materials (ContainerNode) for the current active machine and extruder setup. + materials = self.getAvailableMaterials(global_stack.definition.getId(), nozzle_name) + compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) + self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} return True ## This is another convenience function which is shared by all material From 6c6dd0efad01b3bc2e0059b0fcc48d693db0c118 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 16:48:47 +0200 Subject: [PATCH 205/994] Add signals to signal that a material got changed or removed The material models need to know this. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 7 ++++++- cura/Machines/MachineNode.py | 4 ++++ cura/Machines/MaterialNode.py | 7 ++++++- cura/Machines/VariantNode.py | 7 ++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index ca24950c78..e069734ef7 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -6,6 +6,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to cont from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.Interfaces import ContainerInterface import cura.CuraApplication # Imported like this to prevent circular dependencies. +from UM.Signal import Signal from cura.Machines.MachineNode import MachineNode from typing import Dict, List, TYPE_CHECKING @@ -30,6 +31,8 @@ class ContainerTree: def __init__(self) -> None: self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. + self.materialsChanged = Signal() # Emitted when any of the material nodes in the tree got changed. + container_registry = ContainerRegistry.getInstance() container_registry.containerAdded.connect(self._machineAdded) self._loadAll() @@ -58,6 +61,7 @@ class ContainerTree: definition_id = stack.definition.getId() if definition_id not in self.machines: self.machines[definition_id] = MachineNode(definition_id) + self.machines[definition_id].materialsChanged.connect(self.materialsChanged) Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) @@ -69,4 +73,5 @@ class ContainerTree: if definition_id in self.machines: return # Already have this definition ID. - self.machines[definition_id] = MachineNode(definition_id) \ No newline at end of file + self.machines[definition_id] = MachineNode(definition_id) + self.machines[definition_id].materialsChanged.connect(self.materialsChanged) \ No newline at end of file diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 567ec1deab..840c49ff08 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -4,6 +4,7 @@ from typing import Dict, List from UM.Logger import Logger +from UM.Signal import Signal from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from cura.Machines.ContainerNode import ContainerNode @@ -19,6 +20,8 @@ class MachineNode(ContainerNode): super().__init__(container_id) self.variants = {} # type: Dict[str, VariantNode] # Mapping variant names to their nodes. self.global_qualities = {} # type: Dict[str, QualityNode] # Mapping quality types to the global quality for those types. + self.materialsChanged = Signal() # Emitted when one of the materials underneath this machine has been changed. + container_registry = ContainerRegistry.getInstance() try: my_metadata = container_registry.findContainersMetadata(id = container_id)[0] @@ -93,6 +96,7 @@ class MachineNode(ContainerNode): variant_name = variant["name"] if variant_name not in self.variants: self.variants[variant_name] = VariantNode(variant["id"], machine = self) + self.variants[variant_name].materialsChanged.connect(self.materialsChanged) # Find the global qualities for this printer. global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.container_id, global_quality = True) # First try specific to this printer. diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 9421448287..6a0621b366 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -5,6 +5,7 @@ from typing import Any, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface +from UM.Signal import Signal from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode @@ -20,6 +21,8 @@ class MaterialNode(ContainerNode): super().__init__(container_id) self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. + self.materialChanged = Signal() # Triggered when the material is removed or its metadata is updated. + container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] self.base_file = my_metadata["base_file"] @@ -59,6 +62,7 @@ class MaterialNode(ContainerNode): # Remove myself from my parent. if self.base_file in self.variant.materials: del self.variant.materials[self.base_file] + self.materialChanged.emit(self) ## Triggered when any metadata changed in any container, but only handles # it when the metadata of this node is changed. @@ -84,4 +88,5 @@ class MaterialNode(ContainerNode): self.guid = new_metadata["GUID"] if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. self.qualities = {} - self._loadAll() # Re-load the quality profiles for this node. \ No newline at end of file + self._loadAll() # Re-load the quality profiles for this node. + self.materialChanged.emit(self) \ No newline at end of file diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 9d170933c5..b265cf5cdb 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -5,6 +5,7 @@ from typing import TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface +from UM.Signal import Signal from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode @@ -26,6 +27,8 @@ class VariantNode(ContainerNode): super().__init__(container_id) self.machine = machine self.materials = {} # type: Dict[str, MaterialNode] # Mapping material base files to their nodes. + self.materialsChanged = Signal() + container_registry = ContainerRegistry.getInstance() self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] # Store our own name so that we can filter more easily. container_registry.containerAdded.connect(self._materialAdded) @@ -55,6 +58,7 @@ class VariantNode(ContainerNode): base_file = material["base_file"] if base_file not in self.materials: self.materials[base_file] = MaterialNode(material["id"], variant = self) + self.materials[base_file].materialChanged.connect(self.materialsChanged) ## When a material gets added to the set of profiles, we need to update our # tree here. @@ -85,4 +89,5 @@ class VariantNode(ContainerNode): if original_variant != "empty" or container.getMetaDataEntry("variant", "empty") == "empty": return # Original was already specific or just as unspecific as the new one. - self.materials[base_file] = MaterialNode(container.getId(), variant = self) \ No newline at end of file + self.materials[base_file] = MaterialNode(container.getId(), variant = self) + self.materials[base_file].materialChanged.connect(self.materialsChanged) \ No newline at end of file From 4ad6f4f635c69c11d41b252313439033e9584a4c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 16:59:05 +0200 Subject: [PATCH 206/994] Update materials models when container tree updates Instead of relying on MaterialManager to do this. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 93d3a9e51f..4f96d2ad8c 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -6,6 +6,8 @@ from typing import Optional, Dict, Set from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty from UM.Qt.ListModel import ListModel +import cura.CuraApplication # Imported like this to prevent a circular reference. +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MaterialNode import MaterialNode from cura.Settings.CuraContainerRegistry import CuraContainerRegistry @@ -27,14 +29,13 @@ class BaseMaterialsModel(ListModel): # Make these managers available to all material models self._container_registry = self._application.getInstance().getContainerRegistry() self._machine_manager = self._application.getMachineManager() - self._material_manager = self._application.getMaterialManager() # Update the stack and the model data when the machine changes self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack) - # Update this model when switching machines + # Update this model when switching machines, when adding materials or changing their metadata. self._machine_manager.activeStackChanged.connect(self._update) - self._material_manager.materialsUpdated.connect(self._update) + ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged) self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") @@ -97,6 +98,16 @@ class BaseMaterialsModel(ListModel): def enabled(self): return self._enabled + ## Triggered when a list of materials changed somewhere in the container + # tree. This change may trigger an _update() call when the materials + # changed for the configuration that this model is looking for. + def _materialsListChanged(self, material: MaterialNode) -> None: + if material.variant.container_id != self._extruder_stack.variant.getId(): + return + if material.variant.machine.container_id != cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack().definition.getId(): + return + self._update() + ## This is an abstract method that needs to be implemented by the specific # models themselves. def _update(self): From 5d76f963542a7f788f293722926db7f55f869043 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 17:01:29 +0200 Subject: [PATCH 207/994] Fix getting available materials without material manager It's a bit weird still that this is executed in the _canUpdate... Oh well. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 4f96d2ad8c..5cb5446372 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -131,7 +131,7 @@ class BaseMaterialsModel(ListModel): nozzle_name = extruder_stack.variant.getName() # Update the available materials (ContainerNode) for the current active machine and extruder setup. - materials = self.getAvailableMaterials(global_stack.definition.getId(), nozzle_name) + materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} return True From ea1c99b7083a114201f4cc3e7f52e8413dd6848b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 17:30:12 +0200 Subject: [PATCH 208/994] Update _favorite_ids in BaseMaterialsModel._update And make all subclasses run its super _update as well to make sure that this gets updated for them. It's necessary for the _createMaterialItem functionality because it needs to add an is_favorite role. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 4 +++- cura/Machines/Models/FavoriteMaterialsModel.py | 4 +--- cura/Machines/Models/GenericMaterialsModel.py | 4 +--- cura/Machines/Models/MaterialBrandsModel.py | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 5cb5446372..3d29b71a8e 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -4,6 +4,8 @@ from typing import Optional, Dict, Set from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty + +from UM.Preferences import Preferences from UM.Qt.ListModel import ListModel import cura.CuraApplication # Imported like this to prevent a circular reference. @@ -111,7 +113,7 @@ class BaseMaterialsModel(ListModel): ## This is an abstract method that needs to be implemented by the specific # models themselves. def _update(self): - pass + self._favorite_ids = set(Preferences.getInstance().getValue("cura/favorite_materials").split(";")) ## This method is used by all material models in the beginning of the # _update() method in order to prevent errors. It's the same in all models diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index bab6df6260..91b90b215f 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -19,12 +19,10 @@ class FavoriteMaterialsModel(BaseMaterialsModel): self._update() def _update(self): + super()._update() if not self._canUpdate(): return - # Get updated list of favorites - self._favorite_ids = self._material_manager.getFavorites() - item_list = [] for root_material_id, container_node in self._available_materials.items(): diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index f5edc22051..a6534f0e9d 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -10,12 +10,10 @@ class GenericMaterialsModel(BaseMaterialsModel): self._update() def _update(self): + super()._update() if not self._canUpdate(): return - # Get updated list of favorites - self._favorite_ids = self._material_manager.getFavorites() - item_list = [] for root_material_id, container_node in self._available_materials.items(): diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index 8bb5217fe7..3af67e37d0 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, pyqtSignal @@ -27,10 +27,9 @@ class MaterialBrandsModel(BaseMaterialsModel): self._update() def _update(self): + super()._update() if not self._canUpdate(): return - # Get updated list of favorites - self._favorite_ids = self._material_manager.getFavorites() brand_item_list = [] brand_group_dict = {} From 8ef410e8263a9d8603a0f9c891864c6d619479cd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Aug 2019 17:41:02 +0200 Subject: [PATCH 209/994] Update the _available_materials in the actual _update function It's confusing that this would be updated in the _canUpdate function. Just cleanliness. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 19 ++++++++++--------- .../Machines/Models/FavoriteMaterialsModel.py | 2 +- cura/Machines/Models/GenericMaterialsModel.py | 2 +- cura/Machines/Models/MaterialBrandsModel.py | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 3d29b71a8e..c669e84f5e 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -115,6 +115,16 @@ class BaseMaterialsModel(ListModel): def _update(self): self._favorite_ids = set(Preferences.getInstance().getValue("cura/favorite_materials").split(";")) + # Update the available materials (ContainerNode) for the current active machine and extruder setup. + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + extruder_stack = global_stack.extruders[str(self._extruder_position)] + nozzle_name = None + if extruder_stack.variant.getId() != "empty_variant": + nozzle_name = extruder_stack.variant.getName() + materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials + compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) + self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + ## This method is used by all material models in the beginning of the # _update() method in order to prevent errors. It's the same in all models # so it's placed here for easy access. @@ -126,16 +136,7 @@ class BaseMaterialsModel(ListModel): extruder_position = str(self._extruder_position) if extruder_position not in global_stack.extruders: return False - extruder_stack = global_stack.extruders[extruder_position] - nozzle_name = None - if extruder_stack.variant.getId() != "empty_variant": - nozzle_name = extruder_stack.variant.getName() - - # Update the available materials (ContainerNode) for the current active machine and extruder setup. - materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials - compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) - self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} return True ## This is another convenience function which is shared by all material diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index 91b90b215f..255ef1dc0a 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -19,9 +19,9 @@ class FavoriteMaterialsModel(BaseMaterialsModel): self._update() def _update(self): - super()._update() if not self._canUpdate(): return + super()._update() item_list = [] diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index a6534f0e9d..2542a6412a 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -10,9 +10,9 @@ class GenericMaterialsModel(BaseMaterialsModel): self._update() def _update(self): - super()._update() if not self._canUpdate(): return + super()._update() item_list = [] diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index 3af67e37d0..dea6982f03 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -27,9 +27,9 @@ class MaterialBrandsModel(BaseMaterialsModel): self._update() def _update(self): - super()._update() if not self._canUpdate(): return + super()._update() brand_item_list = [] brand_group_dict = {} From 7b83e51439461643df121cd7985b3d8dd4193ded Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:04:20 +0200 Subject: [PATCH 210/994] Use container tree to determine default material Using the new architecture here. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 1 + cura/Machines/MaterialManager.py | 40 +++++++++++++------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 840c49ff08..5fd01ac2d5 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -36,6 +36,7 @@ class MachineNode(ContainerNode): self.quality_definition = my_metadata.get("quality_definition", container_id) self.exclude_materials = my_metadata.get("exclude_materials", []) self.preferred_variant_name = my_metadata.get("preferred_variant_name", "") + self.preferred_material = my_metadata.get("preferred_material", "") self.preferred_quality_type = my_metadata.get("preferred_quality_type", "") self._loadAll() diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index c6901d904c..85cdc17b61 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -227,34 +227,26 @@ class MaterialManager(QObject): # you can provide the extruder_definition and then the position is ignored (useful when building up global stack in CuraStackBuilder) def getDefaultMaterial(self, global_stack: "GlobalStack", position: str, nozzle_name: Optional[str], extruder_definition: Optional["DefinitionContainer"] = None) -> Optional["MaterialNode"]: - node = None + if not parseBool(global_stack.getMetaDataEntry("has_materials", False)): + return None - buildplate_name = global_stack.getBuildplateName() - machine_definition = global_stack.definition + definition_id = global_stack.definition.getId() + machine_node = ContainerTree.getInstance().machines[definition_id] - # The extruder-compatible material diameter in the extruder definition may not be the correct value because - # the user can change it in the definition_changes container. - if extruder_definition is None: - extruder_stack_or_definition = global_stack.extruders[position] - is_extruder_stack = True + if extruder_definition is not None: + material_diameter = extruder_definition.getProperty("material_diameter", "value") else: - extruder_stack_or_definition = extruder_definition - is_extruder_stack = False + material_diameter = global_stack.extruders[position].getCompatibleMaterialDiameter() + approximate_material_diameter = round(material_diameter) - if extruder_stack_or_definition and parseBool(global_stack.getMetaDataEntry("has_materials", False)): - if is_extruder_stack: - material_diameter = extruder_stack_or_definition.getCompatibleMaterialDiameter() - else: - material_diameter = extruder_stack_or_definition.getProperty("material_diameter", "value") - - if isinstance(material_diameter, SettingFunction): - material_diameter = material_diameter(global_stack) - approximate_material_diameter = str(round(material_diameter)) - root_material_id = machine_definition.getMetaDataEntry("preferred_material") - root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_material_diameter) - node = self.getMaterialNode(machine_definition.getId(), nozzle_name, buildplate_name, - material_diameter, root_material_id) - return node + if nozzle_name not in machine_node.variants: + Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id)) + return None + available_materials = machine_node.variants[nozzle_name].materials + for base_material, material_node in available_materials.items(): + if machine_node.preferred_material in base_material and approximate_material_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + return material_node + return None def removeMaterialByRootId(self, root_material_id: str): container_registry = CuraContainerRegistry.getInstance() From 295ad564c093a3d9ec34f4ddd83f604c419cbf32 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:34:24 +0200 Subject: [PATCH 211/994] Add function to find preferred material for configuration of printer/nozzle This is supposed to replace the material manager's getDefaultMaterial function. Contributes to issue CURA-6600. --- cura/Machines/VariantNode.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index b265cf5cdb..63134a55f4 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -1,11 +1,12 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import Optional, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal +from UM.Util import parseBool from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode @@ -60,6 +61,21 @@ class VariantNode(ContainerNode): self.materials[base_file] = MaterialNode(material["id"], variant = self) self.materials[base_file].materialChanged.connect(self.materialsChanged) + ## Finds the preferred material for this printer with this nozzle in one of + # the extruders. + # + # If there is no material here (because the printer has no materials or + # because there are no matching material profiles), None is returned. + # \param approximate_diameter The desired approximate diameter of the + # material. + # \return The node for the preferred material, or None if there is no + # match. + def preferredMaterial(self, approximate_diameter) -> Optional[MaterialNode]: + for base_material, material_node in self.materials.items(): + if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + return material_node + return None + ## When a material gets added to the set of profiles, we need to update our # tree here. def _materialAdded(self, container: ContainerInterface): From 6f77c8735c387c5b26cac22164a370a117094e04 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:37:05 +0200 Subject: [PATCH 212/994] Don't load any materials for printers that don't have them For instance the Ultimaker 2 shouldn't display any materials. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 1 + cura/Machines/VariantNode.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 5fd01ac2d5..7cf3e71c05 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -31,6 +31,7 @@ class MachineNode(ContainerNode): # Some of the metadata is cached upon construction here. # ONLY DO THAT FOR METADATA THAT DOESN'T CHANGE DURING RUNTIME! # Otherwise you need to keep it up-to-date during runtime. + self.has_materials = parseBool(my_metadata.get("has_materials", "true")) self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) self.quality_definition = my_metadata.get("quality_definition", container_id) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 63134a55f4..d4b9831f66 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -38,6 +38,10 @@ class VariantNode(ContainerNode): ## (Re)loads all materials under this variant. def _loadAll(self): container_registry = ContainerRegistry.getInstance() + + if not self.machine.has_materials: + return # There should not be any materials loaded for this printer. + # Find all the materials for this variant's name. if not self.machine.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") # These are ONLY the base materials. From 999e19940e40539c4d13808b1fcbf0edd9a6c78c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:43:16 +0200 Subject: [PATCH 213/994] Also don't add any materials added later if there are no materials Keeps it consistent. Contributes to issue CURA-6600. --- cura/Machines/VariantNode.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index d4b9831f66..c02bfab1a5 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -85,10 +85,13 @@ class VariantNode(ContainerNode): def _materialAdded(self, container: ContainerInterface): if container.getMetaDataEntry("type") != "material": return # Not interested. + if not self.machine.has_materials: + return # We won't add any materials. material_definition = container.getMetaDataEntry("definition") if not self.machine.has_machine_materials: if material_definition != "fdmprinter": return + base_file = container.getMetaDataEntry("base_file") if base_file in self.machine.exclude_materials: return # Material is forbidden for this printer. From 0302ae4257e33a4888421d4cf8fd01847361c6f4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:44:41 +0200 Subject: [PATCH 214/994] Don't find any variants if the machine says it doesn't have them Even if there might be a matching variant... Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 ++++ cura/Machines/Models/NozzleModel.py | 5 ++++- resources/definitions/fdmprinter.def.json | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 7cf3e71c05..20d7a28894 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -32,6 +32,7 @@ class MachineNode(ContainerNode): # ONLY DO THAT FOR METADATA THAT DOESN'T CHANGE DURING RUNTIME! # Otherwise you need to keep it up-to-date during runtime. self.has_materials = parseBool(my_metadata.get("has_materials", "true")) + self.has_variants = parseBool(my_metadata.get("has_variants", "false")) self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) self.quality_definition = my_metadata.get("quality_definition", container_id) @@ -91,6 +92,9 @@ class MachineNode(ContainerNode): ## (Re)loads all variants under this printer. def _loadAll(self): + if not self.has_variants: + return + # Find all the variants for this definition ID. container_registry = ContainerRegistry.getInstance() variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") diff --git a/cura/Machines/Models/NozzleModel.py b/cura/Machines/Models/NozzleModel.py index 785ff5b9b9..a5069f4fbd 100644 --- a/cura/Machines/Models/NozzleModel.py +++ b/cura/Machines/Models/NozzleModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt @@ -7,6 +7,7 @@ from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel from UM.Util import parseBool +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType @@ -37,6 +38,8 @@ class NozzleModel(ListModel): if global_stack is None: self.setItems([]) return + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + has_variants = parseBool(global_stack.getMetaDataEntry("has_variants", False)) if not has_variants: diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8327834b7a..df96381317 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -11,6 +11,7 @@ "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, + "has_variants": false, "preferred_material": "generic_pla", "preferred_quality_type": "normal", "machine_extruder_trains": From 81a33af3aaba5c05fe71fa38b5f64cd287029a82 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 15:46:29 +0200 Subject: [PATCH 215/994] Use variant node's preferredMaterial function from MaterialManager too We can reuse that code. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 85cdc17b61..97209cb0f4 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -242,11 +242,7 @@ class MaterialManager(QObject): if nozzle_name not in machine_node.variants: Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id)) return None - available_materials = machine_node.variants[nozzle_name].materials - for base_material, material_node in available_materials.items(): - if machine_node.preferred_material in base_material and approximate_material_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): - return material_node - return None + return machine_node.variants[nozzle_name].preferredMaterial(approximate_material_diameter) def removeMaterialByRootId(self, root_material_id: str): container_registry = CuraContainerRegistry.getInstance() From 46cf7aafa9127cf2d3102bf0efa7497cd04bd37a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 16:44:52 +0200 Subject: [PATCH 216/994] Encode empty containers in container tree if necessary You can now be assured that there is ALWAYS at least one child node, except for child nodes of intent profiles which don't exist. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 22 ++++++++++++---------- cura/Machines/MaterialNode.py | 4 ++++ cura/Machines/QualityNode.py | 2 ++ cura/Machines/VariantNode.py | 8 ++++++-- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 20d7a28894..4ad827cbed 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -92,17 +92,19 @@ class MachineNode(ContainerNode): ## (Re)loads all variants under this printer. def _loadAll(self): - if not self.has_variants: - return - - # Find all the variants for this definition ID. container_registry = ContainerRegistry.getInstance() - variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") - for variant in variants: - variant_name = variant["name"] - if variant_name not in self.variants: - self.variants[variant_name] = VariantNode(variant["id"], machine = self) - self.variants[variant_name].materialsChanged.connect(self.materialsChanged) + if not self.has_variants: + self.variants["empty"] = VariantNode("empty_variant", machine = self) + else: + # Find all the variants for this definition ID. + variants = container_registry.findInstanceContainersMetadata(type = "variant", definition = self.container_id, hardware_type = "nozzle") + for variant in variants: + variant_name = variant["name"] + if variant_name not in self.variants: + self.variants[variant_name] = VariantNode(variant["id"], machine = self) + self.variants[variant_name].materialsChanged.connect(self.materialsChanged) + if not self.variants: + self.variants["empty"] = VariantNode("empty_variant", machine = self) # Find the global qualities for this printer. global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.container_id, global_quality = True) # First try specific to this printer. diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 6a0621b366..0b43b311bf 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -53,6 +53,8 @@ class MaterialNode(ContainerNode): quality_id = quality["id"] if quality_id not in self.qualities: self.qualities[quality_id] = QualityNode(quality_id, parent = self) + if not self.qualities: + self.qualities["empty_quality"] = QualityNode("empty_quality", parent = self) ## Triggered when any container is removed, but only handles it when the # container is removed that this node represents. @@ -62,6 +64,8 @@ class MaterialNode(ContainerNode): # Remove myself from my parent. if self.base_file in self.variant.materials: del self.variant.materials[self.base_file] + if not self.variant.materials: + self.variant.materials["empty_material"] = MaterialNode("empty_material", variant = self.variant) self.materialChanged.emit(self) ## Triggered when any metadata changed in any container, but only handles diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 09785056f1..01b73a2091 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -29,4 +29,6 @@ class QualityNode(ContainerNode): if not isinstance(self.parent, MachineNode): # Not a global profile. for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) + if not self.intents: + self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) # Otherwise, there are no intents for global profiles. \ No newline at end of file diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index c02bfab1a5..c1b294963e 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -6,7 +6,6 @@ from typing import Optional, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal -from UM.Util import parseBool from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode @@ -40,6 +39,7 @@ class VariantNode(ContainerNode): container_registry = ContainerRegistry.getInstance() if not self.machine.has_materials: + self.materials["empty_material"] = MaterialNode("empty_material", variant = self) return # There should not be any materials loaded for this printer. # Find all the materials for this variant's name. @@ -48,7 +48,7 @@ class VariantNode(ContainerNode): else: # Printer has its own material profiles. Look for material profiles with this printer's definition. all_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id) - variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant = self.variant_name) + variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant = self.variant_name) # If empty_variant, this won't return anything. materials_per_base_file = {material["base_file"]: material for material in all_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. @@ -64,6 +64,8 @@ class VariantNode(ContainerNode): if base_file not in self.materials: self.materials[base_file] = MaterialNode(material["id"], variant = self) self.materials[base_file].materialChanged.connect(self.materialsChanged) + if not self.materials: + self.materials["empty_material"] = MaterialNode("empty_material", variant = self) ## Finds the preferred material for this printer with this nozzle in one of # the extruders. @@ -112,5 +114,7 @@ class VariantNode(ContainerNode): if original_variant != "empty" or container.getMetaDataEntry("variant", "empty") == "empty": return # Original was already specific or just as unspecific as the new one. + if "empty_material" in self.materials: + del self.materials["empty_material"] self.materials[base_file] = MaterialNode(container.getId(), variant = self) self.materials[base_file].materialChanged.connect(self.materialsChanged) \ No newline at end of file From d06ce211ff0c357129ebe841f4681d6c46ac9596 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 16:47:57 +0200 Subject: [PATCH 217/994] Document new requirement that there must always be one child Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index e069734ef7..67e5d9fe62 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -20,6 +20,11 @@ if TYPE_CHECKING: # # The tree starts at the machine definitions. For every distinct definition # there will be one machine node here. +# +# All of the fallbacks for material choices, quality choices, etc. should be +# encoded in this tree. There must always be at least one child node (for +# nodes that have children) but that child node may be a node representing the +# empty instance container. class ContainerTree: __instance = None From 9dca6c0127f028e8fba322f5b831c4763b038655 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 16:52:38 +0200 Subject: [PATCH 218/994] Return empty node if preferred node couldn't be found Or any node, really. There must now always be a subnode. Contributes to issue CURA-6600. --- cura/Machines/VariantNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index c1b294963e..836c1336a6 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -76,11 +76,11 @@ class VariantNode(ContainerNode): # material. # \return The node for the preferred material, or None if there is no # match. - def preferredMaterial(self, approximate_diameter) -> Optional[MaterialNode]: + def preferredMaterial(self, approximate_diameter) -> MaterialNode: for base_material, material_node in self.materials.items(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node - return None + return next(iter(self.materials.values())) ## When a material gets added to the set of profiles, we need to update our # tree here. From 9bcf2698d5ee0b8b9914397ca5860a9d0699d635 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 17:02:09 +0200 Subject: [PATCH 219/994] Log warning when preferred material can't be found Contributes to issue CURA-6600. --- cura/Machines/VariantNode.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 836c1336a6..096c09a81e 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -3,6 +3,7 @@ from typing import Optional, TYPE_CHECKING +from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal @@ -80,7 +81,14 @@ class VariantNode(ContainerNode): for base_material, material_node in self.materials.items(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node - return next(iter(self.materials.values())) + fallback = next(iter(self.materials.values())) # Should only happen with empty material node. + Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format( + preferred_material = self.machine.preferred_material, + diameter = approximate_diameter, + variant_id = self.container_id, + fallback = fallback.container_id + )) + return fallback ## When a material gets added to the set of profiles, we need to update our # tree here. From 431c8f4900ca23643c2961d9df2e8e7ee645cdd5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 17:03:01 +0200 Subject: [PATCH 220/994] Build stack using container tree's preferred material/nozzle No need to really implement the fallbacks any more for when there are no materials. Only for when the preferred material can't be found. Contributes to issue CURA-6600. --- cura/Settings/CuraStackBuilder.py | 39 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index d0424983cd..d64512f9c7 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -100,25 +100,10 @@ class CuraStackBuilder: def createExtruderStackWithDefaultSetup(cls, global_stack: "GlobalStack", extruder_position: int) -> None: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - material_manager = MaterialManager.getInstance() registry = application.getContainerRegistry() container_tree = ContainerTree.getInstance() - # get variant container for extruders - extruder_variant_container = application.empty_variant_container - # The container tree listens to the containerAdded signal to add this, but that signal is emitted with a delay which might not have passed yet. - # Therefore we must make sure that it's manually added here. - if global_stack.definition.getId() not in container_tree.machines: - container_tree.machines[global_stack.definition.getId()] = MachineNode(global_stack.definition.getId()) - machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] - extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) - extruder_variant_name = None - if extruder_variant_node is not None: - extruder_variant_container = extruder_variant_node.container - if not extruder_variant_container: - extruder_variant_container = application.empty_variant_container - extruder_variant_name = extruder_variant_container.getName() - + # Get the extruder definition. extruder_definition_dict = global_stack.getMetaDataEntry("machine_extruder_trains") extruder_definition_id = extruder_definition_dict[str(extruder_position)] try: @@ -129,12 +114,22 @@ class CuraStackBuilder: Logger.logException("e", msg) raise IndexError(msg) - # get material container for extruders - material_container = application.empty_material_container - material_node = material_manager.getDefaultMaterial(global_stack, str(extruder_position), extruder_variant_name, - extruder_definition = extruder_definition) - if material_node and material_node.container: - material_container = material_node.container + # Find out what filament diameter we need. + approximate_diameter = round(extruder_definition.getProperty("material_diameter", "value")) # Can't be modified by definition changes since we are just initialising the stack here. + + # The container tree listens to the containerAdded signal to add the definition and build the tree, + # but that signal is emitted with a delay which might not have passed yet. + # Therefore we must make sure that it's manually added here. + if global_stack.definition.getId() not in container_tree.machines: + container_tree.machines[global_stack.definition.getId()] = MachineNode(global_stack.definition.getId()) + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) + if not extruder_variant_node: + Logger.log("w", "Could not find preferred nozzle {nozzle_name}. Falling back to {fallback}.".format(nozzle_name = machine_node.preferred_variant_name, fallback = next(iter(machine_node.variants)))) + extruder_variant_node = next(iter(machine_node.variants.values())) + extruder_variant_container = extruder_variant_node.container + material_node = extruder_variant_node.preferredMaterial(approximate_diameter) + material_container = material_node.container new_extruder_id = registry.uniqueName(extruder_definition_id) new_extruder = cls.createExtruderStack( From 37bd7c6b0eb16ceab63100406110f55d940520eb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 17:13:46 +0200 Subject: [PATCH 221/994] Always return a MaterialNode from getDefaultMaterial Its function is, after all, to find the default. It should always have a default. Sometimes that will be the empty material, but so be it. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 97209cb0f4..b19c8b7926 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -226,12 +226,17 @@ class MaterialManager(QObject): ## Get default material for given global stack, extruder position and extruder nozzle name # you can provide the extruder_definition and then the position is ignored (useful when building up global stack in CuraStackBuilder) def getDefaultMaterial(self, global_stack: "GlobalStack", position: str, nozzle_name: Optional[str], - extruder_definition: Optional["DefinitionContainer"] = None) -> Optional["MaterialNode"]: - if not parseBool(global_stack.getMetaDataEntry("has_materials", False)): - return None - + extruder_definition: Optional["DefinitionContainer"] = None) -> "MaterialNode": definition_id = global_stack.definition.getId() machine_node = ContainerTree.getInstance().machines[definition_id] + if nozzle_name in machine_node.variants: + nozzle_node = machine_node.variants[nozzle_name] + else: + Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id)) + nozzle_node = next(iter(machine_node.variants)) + + if not parseBool(global_stack.getMetaDataEntry("has_materials", False)): + return next(iter(nozzle_node.materials)) if extruder_definition is not None: material_diameter = extruder_definition.getProperty("material_diameter", "value") @@ -239,10 +244,7 @@ class MaterialManager(QObject): material_diameter = global_stack.extruders[position].getCompatibleMaterialDiameter() approximate_material_diameter = round(material_diameter) - if nozzle_name not in machine_node.variants: - Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id)) - return None - return machine_node.variants[nozzle_name].preferredMaterial(approximate_material_diameter) + return nozzle_node.preferredMaterial(approximate_material_diameter) def removeMaterialByRootId(self, root_material_id: str): container_registry = CuraContainerRegistry.getInstance() From 8e06786e7bd5e60b3a6c8971764baa6c31ec8180 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Aug 2019 17:27:39 +0200 Subject: [PATCH 222/994] Use ContainerTree when updating material upon nozzle switch Rather than the material manager which is deprecated. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b560d5ec5e..38c0379036 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1317,6 +1317,8 @@ class MachineManager(QObject): ## Update the material profile in the current stacks when the variant is # changed. + # \param position The extruder stack to update. If provided with None, all + # extruder stacks will be updated. def updateMaterialWithVariant(self, position: Optional[str]) -> None: if self._global_container_stack is None: return @@ -1333,20 +1335,17 @@ class MachineManager(QObject): if extruder.variant.getId() != empty_variant_container.getId(): current_nozzle_name = extruder.variant.getMetaDataEntry("name") - candidate_materials = ContainerTree.getInstance().machines[self._global_container_stack.definition.getId()].variants[current_nozzle_name].materials - - if not candidate_materials: - self._setMaterial(position_item, container_node = None) - continue - - if current_material_base_name in candidate_materials: + # If we can keep the current material after the switch, try to do so. + nozzle_node = ContainerTree.getInstance().machines[self._global_container_stack.definition.getId()].variants[current_nozzle_name] + candidate_materials = nozzle_node.materials + if current_material_base_name in candidate_materials: # The current material is also available after the switch. Retain it. new_material = candidate_materials[current_material_base_name] self._setMaterial(position_item, new_material) - continue - - # The current material is not available, find the preferred one - material_node = MaterialManager.getInstance().getDefaultMaterial(self._global_container_stack, position_item, current_nozzle_name) - if material_node is not None: + else: + # The current material is not available, find the preferred one. + material_diameter = self._global_container_stack.extruders[position].getCompatibleMaterialDiameter() + approximate_material_diameter = round(material_diameter) + material_node = nozzle_node.preferredMaterial(approximate_material_diameter) self._setMaterial(position_item, material_node) ## Given a printer definition name, select the right machine instance. In case it doesn't exist, create a new From 99bf82dee34f5bdd87db7408ee31376c7c9bf09e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 13:22:25 +0200 Subject: [PATCH 223/994] Fix displaying list of nozzles Make it use the ContainerTree structure since the original VariantManager's structure is not populated any more. Contributes to issue CURA-6600. --- cura/Machines/Models/NozzleModel.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/cura/Machines/Models/NozzleModel.py b/cura/Machines/Models/NozzleModel.py index a5069f4fbd..da3d4728e5 100644 --- a/cura/Machines/Models/NozzleModel.py +++ b/cura/Machines/Models/NozzleModel.py @@ -26,7 +26,6 @@ class NozzleModel(ListModel): self._application = Application.getInstance() self._machine_manager = self._application.getMachineManager() - self._variant_manager = self._application.getVariantManager() self._machine_manager.globalContainerChanged.connect(self._update) self._update() @@ -40,19 +39,12 @@ class NozzleModel(ListModel): return machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] - - has_variants = parseBool(global_stack.getMetaDataEntry("has_variants", False)) - if not has_variants: - self.setItems([]) - return - - variant_node_dict = self._variant_manager.getVariantNodes(global_stack, VariantType.NOZZLE) - if not variant_node_dict: + if not machine_node.has_variants: self.setItems([]) return item_list = [] - for hotend_name, container_node in sorted(variant_node_dict.items(), key = lambda i: i[0].upper()): + for hotend_name, container_node in sorted(machine_node.variants.items(), key = lambda i: i[0].upper()): item = {"id": hotend_name, "hotend_name": hotend_name, "container_node": container_node @@ -60,4 +52,4 @@ class NozzleModel(ListModel): item_list.append(item) - self.setItems(item_list) + self.setItems(item_list) \ No newline at end of file From 40b562093d50bc35919a9b15c61e16a86f89cb31 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 13:43:30 +0200 Subject: [PATCH 224/994] Don't unnecessarily deprecate the getMetaDataEntry functionality If possible you should group the metadata queries but otherwise this is still fine to use. Contributes to issue CURA-6600. --- cura/Machines/ContainerNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 74d08dff6c..3e8d3da7da 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -26,17 +26,17 @@ class ContainerNode: ## Gets the metadata of the container that this node represents. # Getting the metadata from the container directly is about 10x as fast. # \return The metadata of the container in this node. - @deprecated("Get the metadata from the container with the ID of this node yourself.", "4.3") def getMetadata(self): return ContainerRegistry.getInstance().findContainersMetadata(id = self.container_id)[0] ## Get an entry from the metadata of the container that this node contains. + # + # This is just a convenience function. # \param entry The metadata entry key to return. # \param default If the metadata is not present or the container is not # found, the value of this default is returned. # \return The value of the metadata entry, or the default if it was not # present. - @deprecated("Get the metadata from the container with the ID of this node yourself.", "4.3") def getMetaDataEntry(self, entry: str, default: Any = None) -> Any: container_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.container_id) if len(container_metadata) == 0: From 617419ccc64869dd28be8fef7ea079238a24fadf Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 13:51:24 +0200 Subject: [PATCH 225/994] Use .container property of nodes to switch profiles This also fixes a crash when switching nozzles since the variant was set to a list of profiles rather than just one profile. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 38c0379036..8c841d00c3 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1240,7 +1240,7 @@ class MachineManager(QObject): def _setVariantNode(self, position: str, variant_node: "VariantNode") -> None: if self._global_container_stack is None: return - self._global_container_stack.extruders[position].variant = CuraContainerRegistry.getInstance().findContainers(id = variant_node.container_id) + self._global_container_stack.extruders[position].variant = variant_node.container self.activeVariantChanged.emit() def _setGlobalVariant(self, container_node: "ContainerNode") -> None: @@ -1254,8 +1254,9 @@ class MachineManager(QObject): if self._global_container_stack is None: return if material_node: - self._global_container_stack.extruders[position].material = CuraContainerRegistry.getInstance().findContainers(id = material_node.container_id)[0] - root_material_id = material_node.container.getMetaDataEntry("base_file", None) + material_container = material_node.container + self._global_container_stack.extruders[position].material = material_container + root_material_id = material_container.getMetaDataEntry("base_file", None) else: self._global_container_stack.extruders[position].material = empty_material_container root_material_id = None From f1f25e53500406ac1ff66637cb811fe5fcc7ac8c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 14:23:18 +0200 Subject: [PATCH 226/994] Get Quality Groups from container tree rather than quality manager The quality manager is deprecated after all. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 8c841d00c3..a9c2b5f954 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -22,6 +22,8 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique +import cura.CuraApplication # Imported like this to prevent circular references. + from cura.Machines.ContainerTree import ContainerTree from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.Machines.MaterialManager import MaterialManager @@ -283,10 +285,11 @@ class MachineManager(QObject): self.activeStackValueChanged.emit() ## Given a global_stack, make sure that it's all valid by searching for this quality group and applying it again - def _initMachineState(self, global_stack: "CuraContainerStack") -> None: + def _initMachineState(self) -> None: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() material_dict = {} for position, extruder in global_stack.extruders.items(): - material_dict[position] = extruder.material.getMetaDataEntry("base_file") + material_dict[position] = extruder.material.base_file self._current_root_material_id = material_dict # Update materials to make sure that the diameters match with the machine's @@ -301,7 +304,7 @@ class MachineManager(QObject): # Try to set the same quality/quality_changes as the machine specified. # If the quality/quality_changes is not available, switch to the default or the first quality that's available. same_quality_found = False - quality_groups = self._application.getQualityManager().getQualityGroups(global_stack) + quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() if global_quality_changes.getId() != "empty_quality_changes": quality_changes_groups = self._application.getQualityManager().getQualityChangesGroups(global_stack) @@ -357,7 +360,7 @@ class MachineManager(QObject): self._global_container_stack = global_stack self._application.setGlobalContainerStack(global_stack) ExtruderManager.getInstance()._globalContainerStackChanged() - self._initMachineState(global_stack) + self._initMachineState() self._onGlobalContainerChanged() # Switch to the first enabled extruder From 3de5aa330702d85bac674d2ddd6e3867bde52973 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 14:43:50 +0200 Subject: [PATCH 227/994] Remove _initMachineState It seems to only set profiles to whatever was already in the stack. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 53 --------------------------------- 1 file changed, 53 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a9c2b5f954..97891c127b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -284,58 +284,6 @@ class MachineManager(QObject): # Notify UI items, such as the "changed" star in profile pull down menu. self.activeStackValueChanged.emit() - ## Given a global_stack, make sure that it's all valid by searching for this quality group and applying it again - def _initMachineState(self) -> None: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - material_dict = {} - for position, extruder in global_stack.extruders.items(): - material_dict[position] = extruder.material.base_file - self._current_root_material_id = material_dict - - # Update materials to make sure that the diameters match with the machine's - for position in global_stack.extruders: - self.updateMaterialWithVariant(position) - - global_quality = global_stack.quality - quality_type = global_quality.getMetaDataEntry("quality_type") - global_quality_changes = global_stack.qualityChanges - global_quality_changes_name = global_quality_changes.getName() - - # Try to set the same quality/quality_changes as the machine specified. - # If the quality/quality_changes is not available, switch to the default or the first quality that's available. - same_quality_found = False - quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() - - if global_quality_changes.getId() != "empty_quality_changes": - quality_changes_groups = self._application.getQualityManager().getQualityChangesGroups(global_stack) - new_quality_changes_group = quality_changes_groups.get(global_quality_changes_name) - if new_quality_changes_group is not None: - self._setQualityChangesGroup(new_quality_changes_group) - same_quality_found = True - Logger.log("i", "Machine '%s' quality changes set to '%s'", - global_stack.getName(), new_quality_changes_group.name) - else: - new_quality_group = quality_groups.get(quality_type) - if new_quality_group is not None: - self._setQualityGroup(new_quality_group, empty_quality_changes = True) - same_quality_found = True - Logger.log("i", "Machine '%s' quality set to '%s'", - global_stack.getName(), new_quality_group.quality_type) - - # Could not find the specified quality/quality_changes, switch to the preferred quality if available, - # otherwise the first quality that's available, otherwise empty (not supported). - if not same_quality_found: - Logger.log("i", "Machine '%s' could not find quality_type '%s' and quality_changes '%s'. " - "Available quality types are [%s]. Switching to default quality.", - global_stack.getName(), quality_type, global_quality_changes_name, - ", ".join(quality_groups.keys())) - preferred_quality_type = global_stack.getMetaDataEntry("preferred_quality_type") - quality_group = quality_groups.get(preferred_quality_type) - if quality_group is None: - if quality_groups: - quality_group = list(quality_groups.values())[0] - self._setQualityGroup(quality_group, empty_quality_changes = True) - @pyqtSlot(str) def setActiveMachine(self, stack_id: str) -> None: self.blurSettings.emit() # Ensure no-one has focus. @@ -360,7 +308,6 @@ class MachineManager(QObject): self._global_container_stack = global_stack self._application.setGlobalContainerStack(global_stack) ExtruderManager.getInstance()._globalContainerStackChanged() - self._initMachineState() self._onGlobalContainerChanged() # Switch to the first enabled extruder From 4fb656ea7bcd008ebf5f320167d8cb91403e8db4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 14:46:42 +0200 Subject: [PATCH 228/994] Don't use deprecated Preferences.getInstance() Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index c669e84f5e..ec4c2dd4f6 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -5,7 +5,6 @@ from typing import Optional, Dict, Set from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty -from UM.Preferences import Preferences from UM.Qt.ListModel import ListModel import cura.CuraApplication # Imported like this to prevent a circular reference. @@ -113,7 +112,7 @@ class BaseMaterialsModel(ListModel): ## This is an abstract method that needs to be implemented by the specific # models themselves. def _update(self): - self._favorite_ids = set(Preferences.getInstance().getValue("cura/favorite_materials").split(";")) + self._favorite_ids = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) # Update the available materials (ContainerNode) for the current active machine and extruder setup. global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() From 1febfde3cc30806962814a8e2f7efa2f8e9b80a6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 15:38:58 +0200 Subject: [PATCH 229/994] Fix switching to printers without variant Since the 'empty_variant' nozzle is now just in the tree, this check is no longer even necessary. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index ec4c2dd4f6..1cf101e1ea 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -117,9 +117,7 @@ class BaseMaterialsModel(ListModel): # Update the available materials (ContainerNode) for the current active machine and extruder setup. global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() extruder_stack = global_stack.extruders[str(self._extruder_position)] - nozzle_name = None - if extruder_stack.variant.getId() != "empty_variant": - nozzle_name = extruder_stack.variant.getName() + nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} From 430bcc90a896fac4b0ae290c1a5f511139632336 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 16:44:08 +0200 Subject: [PATCH 230/994] Make QualityChangesGroup depend on intent This is probably the main implementation of CURA-6600. --- cura/Machines/QualityChangesGroup.py | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 16e3e08c81..4881f70839 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -1,33 +1,12 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING - -from UM.Application import Application -from UM.ConfigurationErrorMessage import ConfigurationErrorMessage - from .QualityGroup import QualityGroup -if TYPE_CHECKING: - from cura.Machines.QualityNode import QualityNode - - class QualityChangesGroup(QualityGroup): - def __init__(self, name: str, quality_type: str, parent = None) -> None: + def __init__(self, name: str, quality_type: str, intent_category: str, parent = None) -> None: super().__init__(name, quality_type, parent) - self._container_registry = Application.getInstance().getContainerRegistry() - - def addNode(self, node: "QualityNode") -> None: - extruder_position = node.container.getMetaDataEntry("position") - - if extruder_position is None and self.node_for_global is not None or extruder_position in self.nodes_for_extruders: #We would be overwriting another node. - ConfigurationErrorMessage.getInstance().addFaultyContainers(node.container_id) - return - - if extruder_position is None: # Then we're a global quality changes profile. - self.node_for_global = node - else: # This is an extruder's quality changes profile. - self.nodes_for_extruders[extruder_position] = node + self.intent_category = intent_category def __str__(self) -> str: return "%s[<%s>, available = %s]" % (self.__class__.__name__, self.name, self.is_available) From bcd450daa078e722f5623d71fde0ec782a2dbd3a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 17:11:21 +0200 Subject: [PATCH 231/994] Don't make QualityChangesGroup hold ContainerNodes It can't hold ContainerNodes since the quality changes are no longer nodes in any tree. This now makes it hold metadata instead. Contributes to issue CURA-6600. --- cura/Machines/QualityChangesGroup.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 4881f70839..f798a18e29 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -1,12 +1,23 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from .QualityGroup import QualityGroup +from PyQt5.QtCore import QObject +from typing import Any, Dict, Optional -class QualityChangesGroup(QualityGroup): +## Data struct to group several quality changes instance containers together. +# +# Each group represents one "custom profile" as the user sees it, which +# contains an instance container for the global stack and one instance +# container per extruder. +class QualityChangesGroup(QObject): def __init__(self, name: str, quality_type: str, intent_category: str, parent = None) -> None: - super().__init__(name, quality_type, parent) + super().__init__(parent) + self.name = name + self.quality_type = quality_type self.intent_category = intent_category + self.is_available = False + self.metadata_for_global = None # type: Optional[str] + self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] def __str__(self) -> str: - return "%s[<%s>, available = %s]" % (self.__class__.__name__, self.name, self.is_available) + return "{class_name}[{name}, available = {is_available}]".format(class_name = self.__class__.__name__, name = self.name, is_available = self.is_available) From b1ce9b64d457f40889647852285d294533d2e283 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 17:26:57 +0200 Subject: [PATCH 232/994] Add function to construct QualityChangesGroups for machine It doesn't cache these any more, but reconstructs them when asked for. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 4ad827cbed..eac24abcb9 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -8,6 +8,7 @@ from UM.Signal import Signal from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. from cura.Machines.ContainerNode import ContainerNode +from cura.Machines.QualityChangesGroup import QualityChangesGroup # To construct groups of quality changes profiles that belong together. from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode @@ -90,6 +91,50 @@ class MachineNode(ContainerNode): quality_groups[quality_type].is_available = True return quality_groups + ## Returns all of the quality changes groups available to this printer. + # + # The quality changes groups store which quality type and intent category + # they were made for, but not which material and nozzle. Instead for the + # quality type and intent category, the quality changes will always be + # available but change the quality type and intent category when + # activated. + # + # The quality changes group does depend on the printer: Which quality + # definition is used. + # + # The quality changes groups that are available do depend on the quality + # types that are available, so it must still be known which extruders are + # enabled and which materials and variants are loaded in them. This allows + # setting the correct is_available flag. + # \param variant_names The names of the variants loaded in each extruder. + # \param material_bases The base file names of the materials loaded in + # each extruder. + # \param extruder_enabled For each extruder whether or not they are + # enabled. + # \return List of all quality changes groups for the printer. + def getQualityChangesGroups(self, variant_names: List[str], material_bases: List[str], extruder_enabled: List[bool]) -> List[QualityChangesGroup]: + machine_quality_changes = ContainerRegistry.getInstance().findContainersMetadata(type = "quality_changes", definition = self.quality_definition) # All quality changes for each extruder. + + groups_by_name = {} # Group quality changes profiles by their display name. The display name must be unique for quality changes. This finds profiles that belong together in a group. + for quality_changes in machine_quality_changes: + name = quality_changes["name"] + if name not in groups_by_name: + groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], intent_category = quality_changes.get("intent_category", "default")) + if "position" in quality_changes: # An extruder profile. + groups_by_name[name].metadata_per_extruder[int(quality_changes["position"])] = quality_changes + else: # Global profile. + groups_by_name[name].metadata_for_global = quality_changes + + quality_groups = self.getQualityGroups(variant_names, material_bases, extruder_enabled) + for quality_changes_group in groups_by_name.values(): + if quality_changes_group.quality_type not in quality_groups: + quality_changes_group.is_available = False + else: + # Quality changes group is available iff the quality group it depends on is available. Irrespective of whether the intent category is available. + quality_changes_group.is_available = quality_groups[quality_changes_group.quality_type].is_available + + return list(groups_by_name.values()) + ## (Re)loads all variants under this printer. def _loadAll(self): container_registry = ContainerRegistry.getInstance() From 51710c2868129c942971c07e693d782632656a06 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 17:29:32 +0200 Subject: [PATCH 233/994] Use new MachineNode.getQualityChangesGroups instead of quality manager I hope that the machine node doesn't become a collection of functions that don't fit anywhere else, but this isn't contributing to that hope. However I still think that this is particular to a certain printer, so it's within the object-oriented programming paradigm. And it's also within the scope of the class, which is getting the available profiles. So it still sort of fits. Contributes to issue CURA-6600. --- .../CustomQualityProfilesDropDownMenuModel.py | 21 ++++++++-------- cura/Machines/QualityManager.py | 25 ++++--------------- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index ea1746acc8..11ea391aaa 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -4,15 +4,12 @@ from UM.Logger import Logger import cura.CuraApplication # Imported this way to prevent circular references. +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel -from cura.Machines.QualityManager import QualityManager - -# -# This model is used for the custom profile items in the profile drop down menu. -# +## This model is used for the custom profile items in the profile drop down +# menu. class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): - def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) @@ -22,12 +19,14 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): Logger.log("d", "No active GlobalStack, set %s as empty.", self.__class__.__name__) return - quality_changes_group_dict = QualityManager.getInstance().getQualityChangesGroups(active_global_stack) + variant_names = [extruder.variant.getName() for extruder in active_global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in active_global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in active_global_stack.extruders.values()] + machine_node = ContainerTree.getInstance().machines[active_global_stack.definition.getId()] + quality_changes_list = machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) item_list = [] - for key in sorted(quality_changes_group_dict, key = lambda name: name.upper()): - quality_changes_group = quality_changes_group_dict[key] - + for quality_changes_group in sorted(quality_changes_list, key = lambda qgc: qgc.name.lower()): item = {"name": quality_changes_group.name, "layer_height": "", "layer_height_without_unit": "", @@ -36,4 +35,4 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): item_list.append(item) - self.setItems(item_list) + self.setItems(item_list) \ No newline at end of file diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index e0364ba172..3bb77504c8 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -76,26 +76,11 @@ class QualityManager(QObject): # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: - machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) - - machine_node = self._machine_quality_type_to_quality_changes_dict.get(machine_definition_id) - if not machine_node: - Logger.log("i", "Cannot find node for machine def [%s] in QualityChanges lookup table", machine_definition_id) - return dict() - - # Update availability for each QualityChangesGroup: - # A custom profile is always available as long as the quality_type it's based on is available - quality_group_dict = self.getQualityGroups(machine) - available_quality_type_list = [qt for qt, qg in quality_group_dict.items() if qg.is_available] - - # Iterate over all quality_types in the machine node - quality_changes_group_dict = dict() - for quality_type, quality_changes_node in machine_node.quality_type_map.items(): - for quality_changes_name, quality_changes_group in quality_changes_node.children_map.items(): - quality_changes_group_dict[quality_changes_name] = quality_changes_group - quality_changes_group.is_available = quality_type in available_quality_type_list - - return quality_changes_group_dict + variant_names = [extruder.variant.getName() for extruder in machine.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in machine.extruders.values()] + machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] + return machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) ## Gets the quality groups for the current printer. # From 3655981c41815485b6e5f6fbce2abf5c1f87d46e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 14:00:35 +0200 Subject: [PATCH 234/994] Use container tree to get the current printer's quality groups Contributes to issue CURA-6600. --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 5113bd99b5..9b661f1996 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -8,6 +8,7 @@ from UM.Qt.ListModel import ListModel from UM.Settings.SettingFunction import SettingFunction import cura.CuraApplication # Imported this way to prevent circular dependencies. +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.QualityManager import QualityGroup, QualityManager @@ -70,7 +71,7 @@ class QualityProfilesDropDownMenuModel(ListModel): self.setItems([]) return - quality_group_dict = QualityManager.getInstance().getQualityGroups(global_stack) + quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() item_list = [] for key in sorted(quality_group_dict): From af9c5cd55ce815812cee5da2067edba7dc70dcdc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 14:47:58 +0200 Subject: [PATCH 235/994] Find global qualities for quality_definition as well We don't have global qualities specific to e.g. the Ultimaker 3 Extended. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index eac24abcb9..5e89dfc24d 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -152,7 +152,7 @@ class MachineNode(ContainerNode): self.variants["empty"] = VariantNode("empty_variant", machine = self) # Find the global qualities for this printer. - global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.container_id, global_quality = True) # First try specific to this printer. + global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.quality_definition, global_quality = True) # First try specific to this printer. if len(global_qualities) == 0: # This printer doesn't override the global qualities. global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = True) # Otherwise pick the global global qualities. for global_quality in global_qualities: From a90b4cc13683d7c6925f8746cde01c1c812a407a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 15:05:01 +0200 Subject: [PATCH 236/994] Fix finding global qualities: Metadata is not boolean It's a string, strangely. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 5e89dfc24d..80cb983daf 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -152,8 +152,8 @@ class MachineNode(ContainerNode): self.variants["empty"] = VariantNode("empty_variant", machine = self) # Find the global qualities for this printer. - global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.quality_definition, global_quality = True) # First try specific to this printer. + global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.quality_definition, global_quality = "True") # First try specific to this printer. if len(global_qualities) == 0: # This printer doesn't override the global qualities. - global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = True) # Otherwise pick the global global qualities. + global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = "True") # Otherwise pick the global global qualities. for global_quality in global_qualities: self.global_qualities[global_quality["quality_type"]] = QualityNode(global_quality["id"], parent = self) \ No newline at end of file From 599dcb34bc7e45b329ce53404f8c4cc52ab734f0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 15:25:11 +0200 Subject: [PATCH 237/994] Fix sorting qualities by quality type Otherwise the dictionary ends up being filled by container ID which then causes the quality type to not be present in the dictionary, ending up with an empty list of quality groups. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 80cb983daf..0629a02ad9 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -72,15 +72,16 @@ class MachineNode(ContainerNode): qualities_per_type_per_extruder[extruder_nr] = self.global_qualities else: # Use the actually specialised quality profiles. - qualities_per_type_per_extruder[extruder_nr] = self.variants[variant_name].materials[material_base].qualities + qualities_per_type_per_extruder[extruder_nr] = {node.getMetaDataEntry("quality_type"): node for node in self.variants[variant_name].materials[material_base].qualities.values()} # Create the quality group for each available type. quality_groups = {} for quality_type, global_quality_node in self.global_qualities.items(): quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node - for extruder, qualities_per_type in qualities_per_type_per_extruder: - quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] + for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): + if quality_type in qualities_per_type: + quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] available_quality_types = set(quality_groups.keys()) for extruder_nr, qualities_per_type in enumerate(qualities_per_type_per_extruder): From 01c0472872bcd5580deaf8e8a67ac5bc210e533f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 15:49:52 +0200 Subject: [PATCH 238/994] Don't create container tree for extruder definitions That wouldn't work properly anyway, but it still took quite a lot of time to create these. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 67e5d9fe62..4fe649610e 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -5,11 +5,12 @@ from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.Interfaces import ContainerInterface -import cura.CuraApplication # Imported like this to prevent circular dependencies. from UM.Signal import Signal +import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.MachineNode import MachineNode +from cura.Settings.GlobalStack import GlobalStack # To listen only to global stacks being added. -from typing import Dict, List, TYPE_CHECKING +from typing import Dict, TYPE_CHECKING import time if TYPE_CHECKING: @@ -63,6 +64,8 @@ class ContainerTree: start_time = time.time() all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: + if not isinstance(stack, GlobalStack): + continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. definition_id = stack.definition.getId() if definition_id not in self.machines: self.machines[definition_id] = MachineNode(definition_id) From be36ae278b2ca02cede95796ffb4abdefaa7cd52 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 16:23:20 +0200 Subject: [PATCH 239/994] Fix tests mocking container tree instead of quality manager Contributes to issue CURA-6600. --- tests/TestIntentManager.py | 105 ++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 1e2786ca6e..97ea663344 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import MagicMock, patch import pytest @@ -5,32 +8,25 @@ from typing import Any, Dict, List from cura.Settings.IntentManager import IntentManager from cura.Machines.QualityGroup import QualityGroup -from cura.Machines.QualityManager import QualityManager from tests.Settings.MockContainer import MockContainer +@pytest.fixture() +def mock_container_tree() -> MagicMock: + container_tree = MagicMock() + container_tree.getCurrentQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata) + return container_tree @pytest.fixture() -def quality_manager(application, container_registry, global_stack) -> QualityManager: - application.getGlobalContainerStack = MagicMock(return_value = global_stack) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - manager = QualityManager() - return manager - - -@pytest.fixture() -def intent_manager(application, extruder_manager, machine_manager, quality_manager, container_registry, global_stack) -> IntentManager: +def intent_manager(application, extruder_manager, machine_manager, container_registry, global_stack) -> IntentManager: application.getExtruderManager = MagicMock(return_value = extruder_manager) application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getMachineManager = MagicMock(return_value = machine_manager) - application.getQualityManager = MagicMock(return_value = quality_manager) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): manager = IntentManager() return manager - mocked_intent_metadata = [ {"id": "um3_aa4_pla_smooth_normal", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", "material_id": "generic_pla", "intent_category": "smooth", "quality_type": "normal"}, @@ -65,14 +61,12 @@ def mockFindContainers(**kwargs) -> List[MockContainer]: return result -def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None: +def doSetup(application, extruder_manager, container_registry, global_stack) -> None: container_registry.findContainersMetadata = MagicMock(side_effect = mockFindMetadata) container_registry.findContainers = MagicMock(side_effect = mockFindContainers) - quality_manager.getQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata) - for _, qualitygroup in mocked_qualitygroup_metadata.items(): + for qualitygroup in mocked_qualitygroup_metadata.values(): qualitygroup.node_for_global = MagicMock(name = "Node for global") - application.getQualityManager = MagicMock(return_value = quality_manager) global_stack.definition = MockContainer({"id": "ultimaker3"}) application.getGlobalContainerStack = MagicMock(return_value = global_stack) @@ -100,42 +94,45 @@ def test_intentCategories(application, intent_manager, container_registry): assert "smooth" in categories, "smooth should be in categories" -def test_getCurrentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): - doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) +def test_getCurrentAvailableIntents(application, extruder_manager, intent_manager, container_registry, global_stack, mock_container_tree): + doSetup(application, extruder_manager, container_registry, global_stack) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - intents = intent_manager.getCurrentAvailableIntents() - assert ("smooth", "normal") in intents - assert ("strong", "abnorm") in intents - #assert ("default", "normal") in intents # Pending to-do in 'IntentManager'. - #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. - assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. - - -def test_currentAvailableIntentCategories(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): - doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): - categories = intent_manager.currentAvailableIntentCategories() - assert "default" in categories # Currently inconsistent with 'currentAvailableIntents'! - assert "smooth" in categories - assert "strong" in categories - assert len(categories) == 3 - - -def test_selectIntent(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack): - doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)): + with patch("cura.Machines.ContainerTree.ContainerTree.getInstance", MagicMock(return_value = mock_container_tree)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): intents = intent_manager.getCurrentAvailableIntents() - for intent, quality in intents: - intent_manager.selectIntent(intent, quality) - extruder_stacks = extruder_manager.getUsedExtruderStacks() - assert len(extruder_stacks) == 2 - assert extruder_stacks[0].intent.getMetaDataEntry("intent_category") == intent - assert extruder_stacks[1].intent.getMetaDataEntry("intent_category") == intent + assert ("smooth", "normal") in intents + assert ("strong", "abnorm") in intents + #assert ("default", "normal") in intents # Pending to-do in 'IntentManager'. + #assert ("default", "abnorm") in intents # Pending to-do in 'IntentManager'. + assert len(intents) == 2 # Or 4? pending to-do in 'IntentManager'. + + +def test_currentAvailableIntentCategories(application, extruder_manager, intent_manager, container_registry, global_stack, mock_container_tree): + doSetup(application, extruder_manager, container_registry, global_stack) + + with patch("cura.Machines.ContainerTree.ContainerTree.getInstance", MagicMock(return_value = mock_container_tree)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value = extruder_manager)): + categories = intent_manager.currentAvailableIntentCategories() + assert "default" in categories # Currently inconsistent with 'currentAvailableIntents'! + assert "smooth" in categories + assert "strong" in categories + assert len(categories) == 3 + + +def test_selectIntent(application, extruder_manager, intent_manager, container_registry, global_stack, mock_container_tree): + doSetup(application, extruder_manager, container_registry, global_stack) + + with patch("cura.Machines.ContainerTree.ContainerTree.getInstance", MagicMock(return_value = mock_container_tree)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value = extruder_manager)): + intents = intent_manager.getCurrentAvailableIntents() + for intent, quality in intents: + intent_manager.selectIntent(intent, quality) + extruder_stacks = extruder_manager.getUsedExtruderStacks() + assert len(extruder_stacks) == 2 + assert extruder_stacks[0].intent.getMetaDataEntry("intent_category") == intent + assert extruder_stacks[1].intent.getMetaDataEntry("intent_category") == intent From 16ee96def952deb5d978e4ae650598bab1459e64 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 16:30:16 +0200 Subject: [PATCH 240/994] Fix skipping definition containers when adding new printers The speed improvement didn't work. It still doesn't seem to have a lot of effect. Maybe it's not the creating of the tree that causes this slowdown? Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 4fe649610e..1b71a5e5f8 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -8,7 +8,7 @@ from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.MachineNode import MachineNode -from cura.Settings.GlobalStack import GlobalStack # To listen only to global stacks being added. +from cura.Settings.ExtruderStack import ExtruderStack # To skip extruder stacks being added. from typing import Dict, TYPE_CHECKING import time @@ -64,7 +64,7 @@ class ContainerTree: start_time = time.time() all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: - if not isinstance(stack, GlobalStack): + if isinstance(stack, ExtruderStack): continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. definition_id = stack.definition.getId() if definition_id not in self.machines: @@ -77,6 +77,8 @@ class ContainerTree: def _machineAdded(self, definition_container: ContainerInterface): if not isinstance(definition_container, DefinitionContainer): return # Not our concern. + if definition_container.getMetaDataEntry("position") is not None: + return # This is an extruder definition. Not our concern. definition_id = definition_container.getId() if definition_id in self.machines: return # Already have this definition ID. From 60939d220bea81ff1af587cbe65b4a5777d446c1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 16:58:13 +0200 Subject: [PATCH 241/994] Log time it takes to add container tree for a printer It's useful to know, at least while we're building this. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 1b71a5e5f8..4299003b16 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -68,8 +68,10 @@ class ContainerTree: continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. definition_id = stack.definition.getId() if definition_id not in self.machines: + definition_start_time = time.time() self.machines[definition_id] = MachineNode(definition_id) self.machines[definition_id].materialsChanged.connect(self.materialsChanged) + Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - definition_start_time)) Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) @@ -83,5 +85,7 @@ class ContainerTree: if definition_id in self.machines: return # Already have this definition ID. + start_time = time.time() self.machines[definition_id] = MachineNode(definition_id) - self.machines[definition_id].materialsChanged.connect(self.materialsChanged) \ No newline at end of file + self.machines[definition_id].materialsChanged.connect(self.materialsChanged) + Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) \ No newline at end of file From 557c3d95152ce4ca7079db11c1cbefa39a2f5deb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 17:11:22 +0200 Subject: [PATCH 242/994] Skip global stacks better Otherwise it wouldn't skip custom-defined stacks, such as the PPA's stack class. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 4299003b16..80681c902d 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -3,12 +3,11 @@ from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. -from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.MachineNode import MachineNode -from cura.Settings.ExtruderStack import ExtruderStack # To skip extruder stacks being added. +from cura.Settings.GlobalStack import GlobalStack # To listen only to global stacks being added. from typing import Dict, TYPE_CHECKING import time @@ -64,7 +63,7 @@ class ContainerTree: start_time = time.time() all_stacks = ContainerRegistry.getInstance().findContainerStacks() for stack in all_stacks: - if isinstance(stack, ExtruderStack): + if not isinstance(stack, GlobalStack): continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. definition_id = stack.definition.getId() if definition_id not in self.machines: @@ -76,12 +75,10 @@ class ContainerTree: Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) ## When a printer gets added, we need to build up the tree for that container. - def _machineAdded(self, definition_container: ContainerInterface): - if not isinstance(definition_container, DefinitionContainer): + def _machineAdded(self, container_stack: ContainerInterface): + if not isinstance(container_stack, GlobalStack): return # Not our concern. - if definition_container.getMetaDataEntry("position") is not None: - return # This is an extruder definition. Not our concern. - definition_id = definition_container.getId() + definition_id = container_stack.definition.getId() if definition_id in self.machines: return # Already have this definition ID. From fcab800a8d14c901995fff675c157983fd6b15c8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 26 Aug 2019 17:50:46 +0200 Subject: [PATCH 243/994] Add function to find preferred quality profile Not for global yet, so it doesn't appear as if anything is loaded yet. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 23 +++++++++++++++++++++++ cura/Machines/QualityNode.py | 4 ++++ cura/Machines/VariantNode.py | 10 ++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 0b43b311bf..a5a3bd8e72 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -3,6 +3,7 @@ from typing import Any, TYPE_CHECKING +from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal @@ -32,6 +33,28 @@ class MaterialNode(ContainerNode): container_registry.containerRemoved.connect(self._onRemoved) container_registry.containerMetaDataChanged.connect(self._onMetadataChanged) + ## Finds the preferred quality for this printer with this material and this + # variant loaded. + # + # If the preferred quality is not available, an arbitrary quality is + # returned. If there is a configuration mistake (like a typo in the + # preferred quality) this returns a random available quality. If there are + # no available qualities, this will return the empty quality node. + # \return The node for the preferred quality, or any arbitrary quality if + # there is no match. + def preferredQuality(self) -> QualityNode: + for quality_id, quality_node in self.qualities.items(): + if self.variant.machine.preferred_quality_type == quality_node.quality_type: + return quality_node + fallback = next(iter(self.qualities.values())) # Should only happen with empty quality node. + Logger.log("w", "Could not find preferred quality type {preferred_quality_type} for material {material_id} and variant {variant_id}, falling back to {fallback}.".format( + preferred_quality_type = self.variant.machine.preferred_quality_type, + material_id = self.container_id, + variant_id = self.variant.container_id, + fallback = fallback.container_id + )) + return fallback + def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all quality profiles that fit on this material. diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 01b73a2091..451c8babfb 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -20,6 +20,10 @@ class QualityNode(ContainerNode): super().__init__(container_id) self.parent = parent self.intents = {} # type: Dict[str, IntentNode] + + my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = container_id)[0] + self.quality_type = my_metadata["quality_type"] + self._loadAll() def _loadAll(self) -> None: diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 096c09a81e..f5a1e3006e 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -71,12 +71,14 @@ class VariantNode(ContainerNode): ## Finds the preferred material for this printer with this nozzle in one of # the extruders. # - # If there is no material here (because the printer has no materials or - # because there are no matching material profiles), None is returned. + # If the preferred material is not available, an arbitrary material is + # returned. If there is a configuration mistake (like a typo in the + # preferred material) this returns a random available material. If there + # are no available materials, this will return the empty material node. # \param approximate_diameter The desired approximate diameter of the # material. - # \return The node for the preferred material, or None if there is no - # match. + # \return The node for the preferred material, or any arbitrary material + # if there is no match. def preferredMaterial(self, approximate_diameter) -> MaterialNode: for base_material, material_node in self.materials.items(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): From 8f34b3dd7305aed698dfbfd089986be66c80fde0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 09:07:23 +0200 Subject: [PATCH 244/994] Set quality profiles to preferred quality upon stack creation A good default. Possible bug: If there are multiple matching quality profiles but the preferred quality profiles matches none or multiple of them, a random one is chosen. The random profile for the global stack may not match the random one for the extruder? Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 9 +++++++ cura/Settings/CuraStackBuilder.py | 45 +++++++++---------------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 0629a02ad9..efc5b0f128 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -136,6 +136,15 @@ class MachineNode(ContainerNode): return list(groups_by_name.values()) + ## Gets the preferred global quality node, going by the preferred quality + # type. + # + # If the preferred global quality is not in there, an arbitrary global + # quality is taken. + # If there are no global qualities, an empty quality is returned. + def preferredGlobalQuality(self) -> QualityNode: + return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities))) + ## (Re)loads all variants under this printer. def _loadAll(self): container_registry = ContainerRegistry.getInstance() diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index d64512f9c7..30eb0b009c 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -29,6 +29,7 @@ class CuraStackBuilder: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() registry = application.getContainerRegistry() + container_tree = ContainerTree.getInstance() definitions = registry.findDefinitionContainers(id = definition_id) if not definitions: @@ -37,6 +38,12 @@ class CuraStackBuilder: return None machine_definition = definitions[0] + # The container tree listens to the containerAdded signal to add the definition and build the tree, + # but that signal is emitted with a delay which might not have passed yet. + # Therefore we must make sure that it's manually added here. + if machine_definition.getId() not in container_tree.machines: + container_tree.machines[machine_definition.getId()] = MachineNode(machine_definition.getId()) + machine_node = container_tree.machines[machine_definition.getId()] generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName()) # Make sure the new name does not collide with any definition or (quality) profile @@ -50,7 +57,7 @@ class CuraStackBuilder: definition = machine_definition, variant_container = application.empty_variant_container, material_container = application.empty_material_container, - quality_container = application.empty_quality_container, + quality_container = machine_node.preferredGlobalQuality().container, ) new_global_stack.setName(generated_name) @@ -59,33 +66,9 @@ class CuraStackBuilder: for position in extruder_dict: cls.createExtruderStackWithDefaultSetup(new_global_stack, position) - for new_extruder in new_global_stack.extruders.values(): #Only register the extruders if we're sure that all of them are correct. + for new_extruder in new_global_stack.extruders.values(): # Only register the extruders if we're sure that all of them are correct. registry.addContainer(new_extruder) - preferred_quality_type = machine_definition.getMetaDataEntry("preferred_quality_type") - quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() - if not quality_group_dict: - # There is no available quality group, set all quality containers to empty. - new_global_stack.quality = application.empty_quality_container - for extruder_stack in new_global_stack.extruders.values(): - extruder_stack.quality = application.empty_quality_container - else: - # Set the quality containers to the preferred quality type if available, otherwise use the first quality - # type that's available. - if preferred_quality_type not in quality_group_dict: - Logger.log("w", "The preferred quality {quality_type} doesn't exist for this set-up. Choosing a random one.".format(quality_type = preferred_quality_type)) - preferred_quality_type = next(iter(quality_group_dict)) - quality_group = quality_group_dict.get(preferred_quality_type) - - new_global_stack.quality = quality_group.node_for_global.container - if not new_global_stack.quality: - new_global_stack.quality = application.empty_quality_container - for position, extruder_stack in new_global_stack.extruders.items(): - if position in quality_group.nodes_for_extruders and quality_group.nodes_for_extruders[position].container: - extruder_stack.quality = quality_group.nodes_for_extruders[position].container - else: - extruder_stack.quality = application.empty_quality_container - # Register the global stack after the extruder stacks are created. This prevents the registry from adding another # extruder stack because the global stack didn't have one yet (which is enforced since Cura 3.1). registry.addContainer(new_global_stack) @@ -101,7 +84,6 @@ class CuraStackBuilder: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() registry = application.getContainerRegistry() - container_tree = ContainerTree.getInstance() # Get the extruder definition. extruder_definition_dict = global_stack.getMetaDataEntry("machine_extruder_trains") @@ -117,11 +99,7 @@ class CuraStackBuilder: # Find out what filament diameter we need. approximate_diameter = round(extruder_definition.getProperty("material_diameter", "value")) # Can't be modified by definition changes since we are just initialising the stack here. - # The container tree listens to the containerAdded signal to add the definition and build the tree, - # but that signal is emitted with a delay which might not have passed yet. - # Therefore we must make sure that it's manually added here. - if global_stack.definition.getId() not in container_tree.machines: - container_tree.machines[global_stack.definition.getId()] = MachineNode(global_stack.definition.getId()) + # Find the preferred containers. machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] extruder_variant_node = machine_node.variants.get(machine_node.preferred_variant_name) if not extruder_variant_node: @@ -130,6 +108,7 @@ class CuraStackBuilder: extruder_variant_container = extruder_variant_node.container material_node = extruder_variant_node.preferredMaterial(approximate_diameter) material_container = material_node.container + quality_node = material_node.preferredQuality() new_extruder_id = registry.uniqueName(extruder_definition_id) new_extruder = cls.createExtruderStack( @@ -139,7 +118,7 @@ class CuraStackBuilder: position = extruder_position, variant_container = extruder_variant_container, material_container = material_container, - quality_container = application.empty_quality_container + quality_container = quality_node.container ) new_extruder.setNextStack(global_stack) From 0db99e8f219ae2e182bd343851a033890f830053 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:03:46 +0200 Subject: [PATCH 245/994] Get quality groups from container tree Rather than from the quality manager. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 97891c127b..f5daeddf56 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1231,10 +1231,8 @@ class MachineManager(QObject): if self._global_container_stack is None: return Logger.log("d", "Updating quality/quality_changes due to material change") - current_quality_type = None - if self._current_quality_group: - current_quality_type = self._current_quality_group.quality_type - candidate_quality_groups = QualityManager.getInstance().getQualityGroups(self._global_container_stack) + current_quality_type = self._global_container_stack.quality.getMetaDataEntry("quality_type") + candidate_quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() available_quality_types = {qt for qt, g in candidate_quality_groups.items() if g.is_available} Logger.log("d", "Current quality type = [%s]", current_quality_type) From 01796b99cd3ab7485df25f104cd7fedbe67f88bb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:06:35 +0200 Subject: [PATCH 246/994] Simplify getting layer height The stack already makes it fall through properly, so there's no need to implement the fallback again here. The only change is that it now displays 0.1mm as default layer height if there is no quality profile active. I don't think this makes a difference since we don't show the layer height then anyway. And technically it would be more correct too. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index f5daeddf56..75bb87c8cf 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -570,22 +570,15 @@ class MachineManager(QObject): # This is indicated together with the name of the active quality profile. # # \return The layer height of the currently active quality profile. If - # there is no quality profile, this returns 0. + # there is no quality profile, this returns the default layer height. @pyqtProperty(float, notify = activeQualityGroupChanged) def activeQualityLayerHeight(self) -> float: if not self._global_container_stack: return 0 - if self._current_quality_changes_group: - value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.qualityChanges.getId()) - if isinstance(value, SettingFunction): - value = value(self._global_container_stack) - return value - elif self._current_quality_group: - value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.quality.getId()) - if isinstance(value, SettingFunction): - value = value(self._global_container_stack) - return value - return 0 + value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.qualityChanges.getId()) + if isinstance(value, SettingFunction): + value = value(self._global_container_stack) + return value @pyqtProperty(str, notify = activeVariantChanged) def globalVariantName(self) -> str: From 78db68369e031574d42345aa42b83740699a65a0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:11:17 +0200 Subject: [PATCH 247/994] Simplify activeQualityOrQualityChangesName Removed duplicate fallback mechanism if quality is empty. And removed dependency on shadow administration in _current_quality_group. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 75bb87c8cf..fd92654b26 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1547,12 +1547,10 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityOrQualityChangesName(self) -> str: - name = empty_quality_container.getName() - if self._current_quality_changes_group: - name = self._current_quality_changes_group.name - elif self._current_quality_group: - name = self._current_quality_group.name - return name + global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() + if global_container_stack.qualityChanges != CuraApplication.getInstance().empty_quality_changes_container: + return global_container_stack.qualityChanges.getName() + return global_container_stack.quality.getName() @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: From 84c6ec36dca389619f95b11a74423e99efcf9e55 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:14:07 +0200 Subject: [PATCH 248/994] Catch case where there is no global stack Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index fd92654b26..10cf2812bb 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1548,6 +1548,8 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityOrQualityChangesName(self) -> str: global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() + if not global_container_stack: + return CuraApplication.getInstance().empty_quality_container.getName() if global_container_stack.qualityChanges != CuraApplication.getInstance().empty_quality_changes_container: return global_container_stack.qualityChanges.getName() return global_container_stack.quality.getName() From 6f67e6b55f8af47c2df0b3587903c160cabd414c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:16:00 +0200 Subject: [PATCH 249/994] Simplify activeQualityType() and remove dependency on _current_quality_group The shadow administration is annoying so I'm removing it. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 10cf2812bb..c3ea9cefbb 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -590,11 +590,10 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityType(self) -> str: - quality_type = "" - if self._active_container_stack: - if self._current_quality_group: - quality_type = self._current_quality_group.quality_type - return quality_type + global_stack = CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack: + return "" + return global_stack.quality.getMetaDataEntry("quality_type") @pyqtProperty(bool, notify = activeQualityGroupChanged) def isActiveQualitySupported(self) -> bool: From 89a5fe41fee3b7b096e0025ad744046f62f1b77c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 11:19:02 +0200 Subject: [PATCH 250/994] Fix getting empty quality containers Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index c3ea9cefbb..1648ce44bc 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -590,7 +590,7 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityType(self) -> str: - global_stack = CuraApplication.getInstance().getGlobalContainerStack() + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack: return "" return global_stack.quality.getMetaDataEntry("quality_type") @@ -1546,10 +1546,10 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityOrQualityChangesName(self) -> str: - global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: - return CuraApplication.getInstance().empty_quality_container.getName() - if global_container_stack.qualityChanges != CuraApplication.getInstance().empty_quality_changes_container: + return empty_quality_container.getName() + if global_container_stack.qualityChanges != empty_quality_changes_container: return global_container_stack.qualityChanges.getName() return global_container_stack.quality.getName() From 62395d5503b6a7fd5e1df4158794e7d2e0c04666 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 12:39:19 +0200 Subject: [PATCH 251/994] Remove _current_quality_group shadow administration This was causing asynchronicities. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1648ce44bc..8bd86c554c 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -61,7 +61,6 @@ class MachineManager(QObject): self._global_container_stack = None # type: Optional[GlobalStack] self._current_root_material_id = {} # type: Dict[str, str] - self._current_quality_group = None # type: Optional[QualityGroup] self._current_quality_changes_group = None # type: Optional[QualityChangesGroup] self._default_extruder_position = "0" # to be updated when extruders are switched on and off @@ -597,19 +596,17 @@ class MachineManager(QObject): @pyqtProperty(bool, notify = activeQualityGroupChanged) def isActiveQualitySupported(self) -> bool: - is_supported = False - if self._global_container_stack: - if self._current_quality_group: - is_supported = self._current_quality_group.is_available - return is_supported + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_container_stack: + return False + return self.activeQualityGroup.is_available @pyqtProperty(bool, notify = activeQualityGroupChanged) def isActiveQualityExperimental(self) -> bool: - is_experimental = False - if self._global_container_stack: - if self._current_quality_group: - is_experimental = self._current_quality_group.is_experimental - return is_experimental + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_container_stack: + return False + return Util.parseBool(global_container_stack.quality.getMetaDataEntry("is_experimental", False)) ## Returns whether there is anything unsupported in the current set-up. # @@ -1085,7 +1082,6 @@ class MachineManager(QObject): def _setEmptyQuality(self) -> None: if self._global_container_stack is None: return - self._current_quality_group = None self._current_quality_changes_group = None self._global_container_stack.quality = empty_quality_container self._global_container_stack.qualityChanges = empty_quality_changes_container @@ -1109,7 +1105,6 @@ class MachineManager(QObject): if node.container is None: return - self._current_quality_group = quality_group if empty_quality_changes: self._current_quality_changes_group = None @@ -1174,7 +1169,6 @@ class MachineManager(QObject): extruder.quality = quality_container extruder.qualityChanges = quality_changes_container - self._current_quality_group = quality_group self._current_quality_changes_group = quality_changes_group self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() @@ -1515,7 +1509,10 @@ class MachineManager(QObject): @pyqtProperty(QObject, fset = setQualityGroup, notify = activeQualityGroupChanged) def activeQualityGroup(self) -> Optional["QualityGroup"]: - return self._current_quality_group + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack.quality == empty_quality_container: + return None + return ContainerTree.getInstance().getCurrentQualityGroups().get(self.activeQualityType) @pyqtSlot(QObject) def setQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", no_dialog: bool = False) -> None: @@ -1532,7 +1529,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): - self._setQualityGroup(self._current_quality_group) + self._setQualityGroup(self.activeQualityGroup) for stack in [self._global_container_stack] + list(self._global_container_stack.extruders.values()): stack.userChanges.clear() @@ -1555,7 +1552,8 @@ class MachineManager(QObject): @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: - return self._current_quality_group is None and self._current_quality_changes_group is None + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + return global_container_stack and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container def _updateUponMaterialMetadataChange(self) -> None: if self._global_container_stack is None: From 3f5563514c3bd7b9ab61e57b92581a8501a32e45 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 13:03:03 +0200 Subject: [PATCH 252/994] Remove _current_quality_changes_group shadow administration Get the quality changes group back from whichever one is actually active on the stack. This prevents the two from getting out of sync, which makes the code easier to maintain. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 19 ++++++++++++++++++- cura/Settings/MachineManager.py | 27 +++++++++++++++------------ 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 80681c902d..eb2ed7d159 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -9,11 +9,12 @@ import cura.CuraApplication # Imported like this to prevent circular dependenci from cura.Machines.MachineNode import MachineNode from cura.Settings.GlobalStack import GlobalStack # To listen only to global stacks being added. -from typing import Dict, TYPE_CHECKING +from typing import Dict, List, TYPE_CHECKING import time if TYPE_CHECKING: from cura.Machines.QualityGroup import QualityGroup + from cura.Machines.QualityChangesGroup import QualityChangesGroup ## This class contains a look-up tree for which containers are available at # which stages of configuration. @@ -57,6 +58,22 @@ class ContainerTree: extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] return self.machines[global_stack.definition.getId()].getQualityGroups(variant_names, material_bases, extruder_enabled) + ## Get the quality changes groups available for the currently activated + # printer. + # + # This contains all quality changes groups, enabled or disabled. To check + # whether the quality changes group can be activated, test for the + # ``QualityChangesGroup.is_available`` property. + # \return A list of all quality changes groups. + def getCurrentQualityChangesGroups(self) -> List["QualityChangesGroup"]: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return [] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) + ## Builds the initial container tree. def _loadAll(self): Logger.log("i", "Building container tree.") diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 8bd86c554c..ce32eeb195 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -61,7 +61,6 @@ class MachineManager(QObject): self._global_container_stack = None # type: Optional[GlobalStack] self._current_root_material_id = {} # type: Dict[str, str] - self._current_quality_changes_group = None # type: Optional[QualityChangesGroup] self._default_extruder_position = "0" # to be updated when extruders are switched on and off @@ -1082,7 +1081,6 @@ class MachineManager(QObject): def _setEmptyQuality(self) -> None: if self._global_container_stack is None: return - self._current_quality_changes_group = None self._global_container_stack.quality = empty_quality_container self._global_container_stack.qualityChanges = empty_quality_changes_container for extruder in self._global_container_stack.extruders.values(): @@ -1105,9 +1103,6 @@ class MachineManager(QObject): if node.container is None: return - if empty_quality_changes: - self._current_quality_changes_group = None - # Set quality and quality_changes for the GlobalStack self._global_container_stack.quality = quality_group.node_for_global.container if empty_quality_changes: @@ -1169,7 +1164,6 @@ class MachineManager(QObject): extruder.quality = quality_container extruder.qualityChanges = quality_changes_container - self._current_quality_changes_group = quality_changes_group self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() @@ -1214,10 +1208,11 @@ class MachineManager(QObject): ## Update current quality type and machine after setting material def _updateQualityWithMaterial(self, *args: Any) -> None: - if self._global_container_stack is None: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: return Logger.log("d", "Updating quality/quality_changes due to material change") - current_quality_type = self._global_container_stack.quality.getMetaDataEntry("quality_type") + current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") candidate_quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() available_quality_types = {qt for qt, g in candidate_quality_groups.items() if g.is_available} @@ -1229,7 +1224,7 @@ class MachineManager(QObject): return if not available_quality_types: - if self._current_quality_changes_group is None: + if global_stack.qualityChanges == empty_quality_changes_container: Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).") self._setEmptyQuality() return @@ -1510,7 +1505,7 @@ class MachineManager(QObject): @pyqtProperty(QObject, fset = setQualityGroup, notify = activeQualityGroupChanged) def activeQualityGroup(self) -> Optional["QualityGroup"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if global_stack.quality == empty_quality_container: + if not global_stack or global_stack.quality == empty_quality_container: return None return ContainerTree.getInstance().getCurrentQualityGroups().get(self.activeQualityType) @@ -1535,11 +1530,19 @@ class MachineManager(QObject): @pyqtProperty(QObject, fset = setQualityChangesGroup, notify = activeQualityChangesGroupChanged) def activeQualityChangesGroup(self) -> Optional["QualityChangesGroup"]: - return self._current_quality_changes_group + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack or global_stack.qualityChanges == empty_quality_changes_container: + return None + candidate_groups = ContainerTree.getInstance().getCurrentQualityChangesGroups() + for group in candidate_groups: # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. + if group.node_for_global and group.node_for_global.container_id == global_stack.qualityChanges.getId(): + return group + return None @pyqtProperty(bool, notify = activeQualityChangesGroupChanged) def hasCustomQuality(self) -> bool: - return self._current_quality_changes_group is not None + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + return global_stack is None or global_stack.qualityChanges != empty_quality_changes_container @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityOrQualityChangesName(self) -> str: From 72ea1257d784b1cce5c4b315209bb5886686d1b0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Aug 2019 13:50:12 +0200 Subject: [PATCH 253/994] Prevent crash when machine isn't configured correctly yet CURA-6600 --- cura/Machines/Models/BaseMaterialsModel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 1cf101e1ea..3ab11b7e9d 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -116,7 +116,9 @@ class BaseMaterialsModel(ListModel): # Update the available materials (ContainerNode) for the current active machine and extruder setup. global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - extruder_stack = global_stack.extruders[str(self._extruder_position)] + extruder_stack = global_stack.extruders.get(str(self._extruder_position)) + if not extruder_stack: + return nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) From 8c98773f5582d05e9d61c33c3395bba58ff62b6c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Aug 2019 14:18:07 +0200 Subject: [PATCH 254/994] Fix issues with sorting if no printer type is set --- cura/PrinterOutput/PrinterOutputDevice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index 31daacbccc..980ee7864d 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -225,7 +225,7 @@ class PrinterOutputDevice(QObject, OutputDevice): if printer.printerConfiguration is not None and printer.printerConfiguration.hasAnyMaterialLoaded(): all_configurations.add(printer.printerConfiguration) all_configurations.update(printer.availableConfigurations) - new_configurations = sorted(all_configurations, key = lambda config: config.printerType) + new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "") if new_configurations != self._unique_configurations: self._unique_configurations = new_configurations self.uniqueConfigurationsChanged.emit() @@ -233,7 +233,7 @@ class PrinterOutputDevice(QObject, OutputDevice): # Returns the unique configurations of the printers within this output device @pyqtProperty("QStringList", notify = uniqueConfigurationsChanged) def uniquePrinterTypes(self) -> List[str]: - return list(sorted(set([configuration.printerType for configuration in self._unique_configurations]))) + return list(sorted(set([configuration.printerType or "" for configuration in self._unique_configurations]))) def _onPrintersChanged(self) -> None: for printer in self._printers: From 8f75a12d277b290525d3a3559226be06eece185e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Aug 2019 14:46:33 +0200 Subject: [PATCH 255/994] Fix network config syncing --- cura/Settings/MachineManager.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ce32eeb195..e0293c200f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1350,18 +1350,18 @@ class MachineManager(QObject): disabled_used_extruder_position_set.add(int(position)) else: - variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), - extruder_configuration.hotendID) + machine_node = ContainerTree.getInstance().machines.get(self._global_container_stack.definition.getId()) + variant_node = machine_node.variants.get(extruder_configuration.hotendID) + if variant_node: + self._setVariantNode(position, variant_node) + else: + self._global_container_stack.extruders[position].variant = empty_variant_container + material_container_node = MaterialManager.getInstance().getMaterialNodeByType(self._global_container_stack, position, extruder_configuration.hotendID, configuration.buildplateConfiguration, extruder_configuration.material.guid) - if variant_container_node: - self._setVariantNode(position, variant_container_node) - else: - self._global_container_stack.extruders[position].variant = empty_variant_container - if material_container_node: self._setMaterial(position, material_container_node) else: @@ -1371,15 +1371,6 @@ class MachineManager(QObject): self.updateDefaultExtruder() self.updateNumberExtrudersEnabled() - - if configuration.buildplateConfiguration is not None: - global_variant_container_node = self._variant_manager.getBuildplateVariantNode(self._global_container_stack.definition.getId(), configuration.buildplateConfiguration) - if global_variant_container_node: - self._setGlobalVariant(global_variant_container_node) - else: - self._global_container_stack.variant = empty_variant_container - else: - self._global_container_stack.variant = empty_variant_container self._updateQualityWithMaterial() if need_to_show_message: From d479e5ec5860b00bd54a8d8d0144d05dfbd23e0b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Aug 2019 15:05:39 +0200 Subject: [PATCH 256/994] Removed no longer used initialize function CURA-6600 --- cura/Machines/VariantManager.py | 56 --------------------------------- 1 file changed, 56 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 9c074dcf17..4563b985f1 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -51,62 +51,6 @@ class VariantManager: self._exclude_variant_id_list = ["empty_variant"] - # - # Initializes the VariantManager including: - # - initializing the variant lookup table based on the metadata in ContainerRegistry. - # - def initialize(self) -> None: - self._machine_to_variant_dict_map = OrderedDict() - self._machine_to_buildplate_dict_map = OrderedDict() - - # Cache all variants from the container registry to a variant map for better searching and organization. - container_registry = CuraContainerRegistry.getInstance - variant_metadata_list = container_registry.findContainersMetadata(type = "variant") - for variant_metadata in variant_metadata_list: - if variant_metadata["id"] in self._exclude_variant_id_list: - Logger.log("d", "Exclude variant [%s]", variant_metadata["id"]) - continue - - variant_name = variant_metadata["name"] - variant_definition = variant_metadata["definition"] - if variant_definition not in self._machine_to_variant_dict_map: - self._machine_to_variant_dict_map[variant_definition] = OrderedDict() - for variant_type in ALL_VARIANT_TYPES: - self._machine_to_variant_dict_map[variant_definition][variant_type] = dict() - - try: - variant_type = variant_metadata["hardware_type"] - except KeyError: - Logger.log("w", "Variant %s does not specify a hardware_type; assuming 'nozzle'", variant_metadata["id"]) - variant_type = VariantType.NOZZLE - variant_type = VariantType(variant_type) - variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type] - if variant_name in variant_dict: - # ERROR: duplicated variant name. - ConfigurationErrorMessage.getInstance().addFaultyContainers(variant_metadata["id"]) - continue #Then ignore this variant. This now chooses one of the two variants arbitrarily and deletes the other one! No guarantees! - - variant_dict[variant_name] = ContainerNode(metadata = variant_metadata) - - # If the variant is a buildplate then fill also the buildplate map - if variant_type == VariantType.BUILD_PLATE: - if variant_definition not in self._machine_to_buildplate_dict_map: - self._machine_to_buildplate_dict_map[variant_definition] = OrderedDict() - - try: - variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0] - except IndexError as e: - # It still needs to break, but we want to know what variant ID made it break. - msg = "Unable to find build plate variant with the id [%s]" % variant_metadata["id"] - Logger.logException("e", msg) - raise IndexError(msg) - - buildplate_type = variant_container.getProperty("machine_buildplate_type", "value") - if buildplate_type not in self._machine_to_buildplate_dict_map[variant_definition]: - self._machine_to_variant_dict_map[variant_definition][buildplate_type] = dict() - - self._machine_to_buildplate_dict_map[variant_definition][buildplate_type] = variant_dict[variant_name] - # # Gets the variant InstanceContainer with the given information. # Almost the same as getVariantMetadata() except that this returns an InstanceContainer if present. From 36dfd23e3f254ff1078a2ba7215b23dd4c3b0959 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Aug 2019 15:06:27 +0200 Subject: [PATCH 257/994] Remove old buildplate function CURA-6600 --- cura/Machines/VariantManager.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 4563b985f1..617f85b8ca 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -47,7 +47,6 @@ class VariantManager: def __init__(self) -> None: self._machine_to_variant_dict_map = dict() # type: Dict[str, Dict["VariantType", Dict[str, ContainerNode]]] - self._machine_to_buildplate_dict_map = dict() # type: Dict[str, Dict[str, ContainerNode]] self._exclude_variant_id_list = ["empty_variant"] @@ -97,8 +96,3 @@ class VariantManager: if preferred_variant_name: node = self.getVariantNode(machine_definition_id, preferred_variant_name, variant_type) return node - - def getBuildplateVariantNode(self, machine_definition_id: str, buildplate_type: str) -> Optional["ContainerNode"]: - if machine_definition_id in self._machine_to_buildplate_dict_map: - return self._machine_to_buildplate_dict_map[machine_definition_id].get(buildplate_type) - return None From fbf4d42f0654419bd5123b8c0e289bed5830e272 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Aug 2019 15:22:26 +0200 Subject: [PATCH 258/994] Active quality group can be None. part of CURA-6600 --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index e0293c200f..3447581bca 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -598,6 +598,8 @@ class MachineManager(QObject): global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: return False + if not self.activeQualityGroup: + return False return self.activeQualityGroup.is_available @pyqtProperty(bool, notify = activeQualityGroupChanged) From d5a8b2640f86673a740e85c468c2e5c334b8f2ea Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Aug 2019 15:46:47 +0200 Subject: [PATCH 259/994] Fix 'getQualityChangesGroups' now gives a list issues. part of CURA-6600 --- cura/Machines/Models/QualityManagementModel.py | 6 +++--- cura/Machines/QualityManager.py | 5 +++-- plugins/3MFReader/ThreeMFWorkspaceReader.py | 6 +++--- tests/TestQualityManager.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 2a661ec49e..aa2cb3ba5f 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -44,11 +44,11 @@ class QualityManagementModel(ListModel): return quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() - quality_changes_group_dict = self._quality_manager.getQualityChangesGroups(global_stack) + quality_changes_group_list = self._quality_manager.getQualityChangesGroups(global_stack) available_quality_types = set(quality_type for quality_type, quality_group in quality_group_dict.items() if quality_group.is_available) - if not available_quality_types and not quality_changes_group_dict: + if not available_quality_types and not quality_changes_group_list: # Nothing to show self.setItems([]) return @@ -69,7 +69,7 @@ class QualityManagementModel(ListModel): # Create quality_changes group items quality_changes_item_list = [] - for quality_changes_group in quality_changes_group_dict.values(): + for quality_changes_group in quality_changes_group_list: quality_group = quality_group_dict.get(quality_changes_group.quality_type) item = {"name": quality_changes_group.name, "is_read_only": False, diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 3bb77504c8..c03c580197 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING, Optional, Dict +from typing import TYPE_CHECKING, Optional, Dict, List from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot @@ -14,6 +14,7 @@ import cura.CuraApplication from cura.Settings.ExtruderStack import ExtruderStack from cura.Machines.ContainerTree import ContainerTree # The implementation that replaces this manager, to keep the deprecated interface working. +from .QualityChangesGroup import QualityChangesGroup from .QualityGroup import QualityGroup from .QualityNode import QualityNode @@ -75,7 +76,7 @@ class QualityManager(QObject): return # Returns a dict of "custom profile name" -> QualityChangesGroup - def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: + def getQualityChangesGroups(self, machine: "GlobalStack") -> List[QualityChangesGroup]: variant_names = [extruder.variant.getName() for extruder in machine.extruders.values()] material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extruders.values()] extruder_enabled = [extruder.isEnabled for extruder in machine.extruders.values()] diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index b9b69d1ae0..d5fa1cb272 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -1003,11 +1003,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): global_stack.setMetaDataEntry(key, value) if self._quality_changes_to_apply: - quality_changes_group_dict = quality_manager.getQualityChangesGroups(global_stack) - if self._quality_changes_to_apply not in quality_changes_group_dict: + quality_changes_group_list = quality_manager.getQualityChangesGroups(global_stack) + quality_changes_group = next((qcg for qcg in quality_changes_group_list if qcg.name == self._quality_changes_to_apply), None) + if not quality_changes_group: Logger.log("e", "Could not find quality_changes [%s]", self._quality_changes_to_apply) return - quality_changes_group = quality_changes_group_dict[self._quality_changes_to_apply] machine_manager.setQualityChangesGroup(quality_changes_group, no_dialog = True) else: self._quality_type_to_apply = self._quality_type_to_apply.lower() diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py index ef3e9fa6bc..4a0f29c9ee 100644 --- a/tests/TestQualityManager.py +++ b/tests/TestQualityManager.py @@ -61,7 +61,7 @@ def test_getQualityChangesGroup(quality_mocked_application): manager = QualityManager(quality_mocked_application) manager.initialize() - assert "herp" in manager.getQualityChangesGroups(mocked_stack) + assert "herp" in [qcg.name for qcg in manager.getQualityChangesGroups(mocked_stack)] @pytest.mark.skip("Doesn't work on remote") From 5b8ed91b04d88667e9d32604200752cb5bcbefdc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 13:50:48 +0200 Subject: [PATCH 260/994] Create new MaterialManagementModel and move canMaterialBeRemoved Just like the QualityManagementModel, this class is intended to be used as proxy for the material management page in the preferences. I'm intending to move all relevant pyqtSlots from the material manager into this one. The advantage of this switch is that the material manager had no well-bounded scope and so tended to become a big mess of all sorts of functions. This one has a clear scope: serve as a proxy for the buttons you can press in the preferences screen for materials. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 2 ++ cura/Machines/MaterialManager.py | 10 +++--- .../Models/MaterialManagementModel.py | 33 +++++++++++++++++++ .../Preferences/Materials/MaterialsPage.qml | 9 +++-- 4 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 cura/Machines/Models/MaterialManagementModel.py diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c9d2163609..e378224a04 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -85,6 +85,7 @@ from cura.Machines.Models.FirstStartMachineActionsModel import FirstStartMachine from cura.Machines.Models.GenericMaterialsModel import GenericMaterialsModel from cura.Machines.Models.GlobalStacksModel import GlobalStacksModel from cura.Machines.Models.MaterialBrandsModel import MaterialBrandsModel +from cura.Machines.Models.MaterialManagementModel import MaterialManagementModel from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel from cura.Machines.Models.NozzleModel import NozzleModel from cura.Machines.Models.QualityManagementModel import QualityManagementModel @@ -1054,6 +1055,7 @@ class CuraApplication(QtApplication): qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel") qmlRegisterType(MaterialBrandsModel, "Cura", 1, 0, "MaterialBrandsModel") qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel") + qmlRegisterType(MaterialManagementModel, "Cura", 1, 5, "MaterialManagementModel") qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel") diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index b19c8b7926..24995e417b 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -1,5 +1,6 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from collections import defaultdict import copy import uuid @@ -7,19 +8,16 @@ from typing import Dict, Optional, TYPE_CHECKING, Any, List, cast from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot -from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Decorators import deprecated from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Settings.SettingFunction import SettingFunction from UM.Util import parseBool -import cura.CuraApplication #Imported like this to prevent circular imports. +import cura.CuraApplication # Imported like this to prevent circular imports. from cura.Machines.ContainerTree import ContainerTree from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from .MaterialNode import MaterialNode from .MaterialGroup import MaterialGroup -from .VariantType import VariantType if TYPE_CHECKING: from UM.Settings.DefinitionContainer import DefinitionContainer @@ -260,8 +258,8 @@ class MaterialManager(QObject): # Check if the material is active in any extruder train. In that case, the material shouldn't be removed! # In the future we might enable this again, but right now, it's causing a ton of issues if we do (since it # corrupts the configuration) - root_material_id = material_node.container.getMetaDataEntry("base_file") - ids_to_remove = [metadata.get("id", "") for metadata in CuraContainerRegistry.getInstance().findInstanceContainersMetadata(base_file=root_material_id)] + root_material_id = material_node.base_file + ids_to_remove = {metadata.get("id", "") for metadata in CuraContainerRegistry.getInstance().findInstanceContainersMetadata(base_file = root_material_id)} for extruder_stack in CuraContainerRegistry.getInstance().findContainerStacks(type = "extruder_train"): if extruder_stack.material.getId() in ids_to_remove: diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py new file mode 100644 index 0000000000..9cc7cb07c9 --- /dev/null +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -0,0 +1,33 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import QObject, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. +from typing import TYPE_CHECKING + +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry # To find the sets of materials belonging to each other, and currently loaded extruder stacks. + +if TYPE_CHECKING: + from cura.Machines.MaterialNode import MaterialNode + +## Proxy class to the materials page in the preferences. +# +# This class handles the actions in that page, such as creating new materials, +# renaming them, etc. +class MaterialManagementModel(QObject): + ## Can a certain material be deleted, or is it still in use in one of the + # container stacks anywhere? + # + # We forbid the user from deleting a material if it's in use in any stack. + # Deleting it while it's in use can lead to corrupted stacks. In the + # future we might enable this functionality again (deleting the material + # from those stacks) but for now it is easier to prevent the user from + # doing this. + # \return Whether or not the material can be removed. + @pyqtSlot("QVariant", result = bool) + def canMaterialBeRemoved(self, material_node: "MaterialNode"): + container_registry = CuraContainerRegistry.getInstance() + ids_to_remove = {metadata.get("id", "") for metadata in container_registry.findInstanceContainersMetadata(base_file = material_node.base_file)} + for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): + if extruder_stack.material.getId() in ids_to_remove: + return False + return True \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 481a256501..80d746351c 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Dialogs 1.2 import UM 1.2 as UM -import Cura 1.0 as Cura +import Cura 1.5 as Cura Item { @@ -42,6 +42,11 @@ Item name: "cura" } + Cura.MaterialManagementModel + { + id: materialManagement + } + function resetExpandedActiveMaterial() { materialListView.expandActiveMaterial(active_root_material_id) @@ -147,7 +152,7 @@ Item id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" - enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManager.canMaterialBeRemoved(base.currentItem.container_node) + enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && materialManagement.canMaterialBeRemoved(base.currentItem.container_node) onClicked: { From 99ccddefa4824d010214b3693a717183f9a534d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 14:26:06 +0200 Subject: [PATCH 261/994] Move setMaterialName to MaterialManagementModel No longer use the material manager which is deprecated. Contributes to issue CURA-6600. --- cura/Machines/Models/MaterialManagementModel.py | 17 ++++++++++++++++- .../qml/Preferences/Materials/MaterialsView.qml | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 9cc7cb07c9..1b7774c4d3 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -4,6 +4,8 @@ from PyQt5.QtCore import QObject, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. from typing import TYPE_CHECKING +from UM.Logger import Logger + from cura.Settings.CuraContainerRegistry import CuraContainerRegistry # To find the sets of materials belonging to each other, and currently loaded extruder stacks. if TYPE_CHECKING: @@ -22,6 +24,7 @@ class MaterialManagementModel(QObject): # future we might enable this functionality again (deleting the material # from those stacks) but for now it is easier to prevent the user from # doing this. + # \param material_node The ContainerTree node of the material to check. # \return Whether or not the material can be removed. @pyqtSlot("QVariant", result = bool) def canMaterialBeRemoved(self, material_node: "MaterialNode"): @@ -30,4 +33,16 @@ class MaterialManagementModel(QObject): for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): if extruder_stack.material.getId() in ids_to_remove: return False - return True \ No newline at end of file + return True + + ## Change the user-visible name of a material. + # \param material_node The ContainerTree node of the material to rename. + # \param name The new name for the material. + @pyqtSlot("QVariant", str) + def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: + container_registry = CuraContainerRegistry.getInstance() + root_material_id = material_node.base_file + if container_registry.isReadOnly(root_material_id): + Logger.log("w", "Cannot set name of read-only container %s.", root_material_id) + return + return container_registry.findContainers(id = root_material_id)[0].setName(name) \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 30b2474e09..8302f5f65a 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -565,7 +565,7 @@ TabView } // update the values - CuraApplication.getMaterialManager().setMaterialName(base.currentMaterialNode, new_name) + base.materialManagement.setMaterialName(base.currentMaterialNode, new_name) properties.name = new_name } From 3dc7c7b61c4c354ceb7fe16b84cb0bbacf434372 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 14:53:50 +0200 Subject: [PATCH 262/994] Move removeMaterial to MaterialManagementModel Moving away from the MaterialManager. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 2 +- .../Models/MaterialManagementModel.py | 19 ++++++++++++++++++- .../Preferences/Materials/MaterialsPage.qml | 2 +- .../Preferences/Materials/MaterialsView.qml | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 24995e417b..5d5938d95d 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -246,7 +246,7 @@ class MaterialManager(QObject): def removeMaterialByRootId(self, root_material_id: str): container_registry = CuraContainerRegistry.getInstance() - results = container_registry.findContainers(id=root_material_id) + results = container_registry.findContainers(id = root_material_id) if not results: container_registry.addWrongContainerId(root_material_id) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 1b7774c4d3..2c8617073d 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -45,4 +45,21 @@ class MaterialManagementModel(QObject): if container_registry.isReadOnly(root_material_id): Logger.log("w", "Cannot set name of read-only container %s.", root_material_id) return - return container_registry.findContainers(id = root_material_id)[0].setName(name) \ No newline at end of file + return container_registry.findContainers(id = root_material_id)[0].setName(name) + + ## Deletes a material from Cura. + # + # This function does not do any safety checking any more. Please call this + # function only if: + # - The material is not read-only. + # - The material is not used in any stacks. + # If the material was not lazy-loaded yet, this will fully load the + # container. When removing this material node, all other materials with + # the same base fill will also be removed. + # \param material_node The material to remove. + @pyqtSlot("QVariant") + def removeMaterial(self, material_node: "MaterialNode") -> None: + container_registry = CuraContainerRegistry.getInstance() + materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file) + for material_metadata in materials_this_base_file: + container_registry.removeContainer(material_metadata["id"]) \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 80d746351c..3453c866e3 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -302,7 +302,7 @@ Item { // Set the active material as the fallback. It will be selected when the current material is deleted base.newRootMaterialIdToSwitchTo = base.active_root_material_id - base.materialManager.removeMaterial(base.currentItem.container_node); + base.materialManagement.removeMaterial(base.currentItem.container_node); } } diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 8302f5f65a..83c7de9aee 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -565,7 +565,7 @@ TabView } // update the values - base.materialManagement.setMaterialName(base.currentMaterialNode, new_name) + materialManagement.setMaterialName(base.currentMaterialNode, new_name) properties.name = new_name } From b60b13e5bfaf43dec47d94e58da13554721dd765 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 15:06:44 +0200 Subject: [PATCH 263/994] Use container tree to check for variants when serialising Not the variant manager, because it's deprecated. Contributes to issue CURA-6600. --- .../XmlMaterialProfile/XmlMaterialProfile.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 157d871d54..4c1920a97e 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -226,7 +226,7 @@ class XmlMaterialProfile(InstanceContainer): machine_container_map = {} # type: Dict[str, InstanceContainer] machine_variant_map = {} # type: Dict[str, Dict[str, Any]] - variant_manager = CuraApplication.getInstance().getVariantManager() + container_tree = ContainerTree.getInstance() root_material_id = self.getMetaDataEntry("base_file") # if basefile is self.getId, this is a basefile. all_containers = registry.findInstanceContainers(base_file = root_material_id) @@ -243,16 +243,15 @@ class XmlMaterialProfile(InstanceContainer): machine_variant_map[definition_id] = {} variant_name = container.getMetaDataEntry("variant_name") - if variant_name: - variant_node = variant_manager.getVariantNode(definition_id, variant_name) - if variant_node is None: - continue - variant_dict = {"variant_node":variant_node , - "material_container": container} - machine_variant_map[definition_id][variant_name] = variant_dict - continue + if not variant_name: + machine_container_map[definition_id] = container - machine_container_map[definition_id] = container + if variant_name not in container_tree.machines[definition_id].variants: + continue + variant_node = container_tree.machines[definition_id].variants[variant_name] + variant_dict = {"variant_node": variant_node, + "material_container": container} + machine_variant_map[definition_id][variant_name] = variant_dict # Map machine human-readable names to IDs product_id_map = self.getProductIdMap() From 8346e465f65c3cef248ab22b4aa643f3cb1898e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 15:22:28 +0200 Subject: [PATCH 264/994] Turn MaterialManagementModel into a singleton Just like MaterialManager used to be. There can be only one instance of the page then. This prevents a crash when Qt deletes the QObject because it's no longer used in the page when you close the preferences screen. But when you open it again it doesn't construct a new one. Now there is always one instance so that's not a problem any more. Also it allows other pages to access this item. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 7 ++++++- resources/qml/Preferences/Materials/MaterialsPage.qml | 10 +++------- resources/qml/Preferences/Materials/MaterialsView.qml | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e378224a04..c452c56cf5 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -222,6 +222,7 @@ class CuraApplication(QtApplication): self._machine_error_checker = None self._machine_settings_manager = MachineSettingsManager(self, parent = self) + self._material_management_model = MaterialManagementModel() self._discovered_printer_model = DiscoveredPrintersModel(self, parent = self) self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self) @@ -976,6 +977,10 @@ class CuraApplication(QtApplication): def getMachineActionManager(self, *args): return self._machine_action_manager + @pyqtSlot(result = QObject) + def getMaterialManagementModel(self): + return self._material_management_model + def getSimpleModeSettingsManager(self, *args): if self._simple_mode_settings_manager is None: self._simple_mode_settings_manager = SimpleModeSettingsManager() @@ -1055,7 +1060,7 @@ class CuraApplication(QtApplication): qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel") qmlRegisterType(MaterialBrandsModel, "Cura", 1, 0, "MaterialBrandsModel") qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel") - qmlRegisterType(MaterialManagementModel, "Cura", 1, 5, "MaterialManagementModel") + qmlRegisterSingletonType(MaterialManagementModel, "Cura", 1, 5, "MaterialManagementModel", self.getMaterialManagementModel) qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel") diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 3453c866e3..4a6ff75f0d 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -18,6 +18,7 @@ Item property var currentItem: null property var materialManager: CuraApplication.getMaterialManager() + property var materialManagementModel: CuraApplication.getMaterialManagementModel() property var hasCurrentItem: base.currentItem != null property var isCurrentItemActivated: @@ -42,11 +43,6 @@ Item name: "cura" } - Cura.MaterialManagementModel - { - id: materialManagement - } - function resetExpandedActiveMaterial() { materialListView.expandActiveMaterial(active_root_material_id) @@ -152,7 +148,7 @@ Item id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" - enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && materialManagement.canMaterialBeRemoved(base.currentItem.container_node) + enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManagementModel.canMaterialBeRemoved(base.currentItem.container_node) onClicked: { @@ -302,7 +298,7 @@ Item { // Set the active material as the fallback. It will be selected when the current material is deleted base.newRootMaterialIdToSwitchTo = base.active_root_material_id - base.materialManagement.removeMaterial(base.currentItem.container_node); + base.materialManagementModel.removeMaterial(base.currentItem.container_node); } } diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 83c7de9aee..0f5eba2f2f 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -23,6 +23,7 @@ TabView property real secondColumnWidth: (width * 0.40) | 0 property string containerId: "" property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {} + property var materialManagementModel: CuraApplication.getMaterialManagementModel() property double spoolLength: calculateSpoolLength() property real costPerMeter: calculateCostPerMeter() @@ -565,7 +566,7 @@ TabView } // update the values - materialManagement.setMaterialName(base.currentMaterialNode, new_name) + base.materialManagementModel.setMaterialName(base.currentMaterialNode, new_name) properties.name = new_name } From 63ae6ee9ec874f734ad28975fe2866b0df8d03b9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 15:33:39 +0200 Subject: [PATCH 265/994] Fix updating materials models when materials change before first printer switch Otherwise the _extruder_stack field would not yet be set. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 3ab11b7e9d..81be676a33 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -31,8 +31,13 @@ class BaseMaterialsModel(ListModel): self._container_registry = self._application.getInstance().getContainerRegistry() self._machine_manager = self._application.getMachineManager() + self._extruder_position = 0 + self._extruder_stack = None + self._enabled = True + # Update the stack and the model data when the machine changes self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack) + self._updateExtruderStack() # Update this model when switching machines, when adding materials or changing their metadata. self._machine_manager.activeStackChanged.connect(self._update) @@ -55,12 +60,8 @@ class BaseMaterialsModel(ListModel): self.addRoleName(Qt.UserRole + 15, "container_node") self.addRoleName(Qt.UserRole + 16, "is_favorite") - self._extruder_position = 0 - self._extruder_stack = None - self._available_materials = None # type: Optional[Dict[str, MaterialNode]] self._favorite_ids = set() # type: Set[str] - self._enabled = True def _updateExtruderStack(self): global_stack = self._machine_manager.activeMachine From dabd905853b178856dd2fc8320b4a4633b7fa2f3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 15:47:23 +0200 Subject: [PATCH 266/994] Fix serialising materials with submaterials in not loaded container trees Material profiles need to serialise subprofiles that belong to different printers as well. Some of these materials may not be loaded in the ContainerTree structure. To prevent having to load that as well, we're just not going to use the container tree any more. It turns out that the only reason it was using the container tree was to get the hardware_type metadata from the node in the tree. So just get that from the container itself and we're fine. Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 4c1920a97e..ac53564eaf 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -223,8 +223,8 @@ class XmlMaterialProfile(InstanceContainer): for instance in self.findInstances(): self._addSettingElement(builder, instance) - machine_container_map = {} # type: Dict[str, InstanceContainer] - machine_variant_map = {} # type: Dict[str, Dict[str, Any]] + machine_container_map = {} # type: Dict[str, InstanceContainer] + machine_variant_map = {} # type: Dict[str, Dict[str, Any]] container_tree = ContainerTree.getInstance() @@ -246,10 +246,7 @@ class XmlMaterialProfile(InstanceContainer): if not variant_name: machine_container_map[definition_id] = container - if variant_name not in container_tree.machines[definition_id].variants: - continue - variant_node = container_tree.machines[definition_id].variants[variant_name] - variant_dict = {"variant_node": variant_node, + variant_dict = {"variant_type": container.getMetaDataEntry("hardware_type", str(VariantType.NOZZLE)), "material_container": container} machine_variant_map[definition_id][variant_name] = variant_dict @@ -284,8 +281,7 @@ class XmlMaterialProfile(InstanceContainer): # Find all hotend sub-profiles corresponding to this material and machine and add them to this profile. buildplate_dict = {} # type: Dict[str, Any] for variant_name, variant_dict in machine_variant_map[definition_id].items(): - variant_type = variant_dict["variant_node"].getMetaDataEntry("hardware_type", str(VariantType.NOZZLE)) - variant_type = VariantType(variant_type) + variant_type = VariantType(variant_dict["variant_type"]) if variant_type == VariantType.NOZZLE: # The hotend identifier is not the containers name, but its "name". builder.start("hotend", {"id": variant_name}) From 20be7fd8a15e4454b604cc1b188887ac6e9628e5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 16:04:53 +0200 Subject: [PATCH 267/994] Don't add to variant-specific mapping if it's not variant-specific Otherwise we'll encounter that the variant name is None when serialising that subprofile. Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index ac53564eaf..cbdec39054 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -245,6 +245,7 @@ class XmlMaterialProfile(InstanceContainer): variant_name = container.getMetaDataEntry("variant_name") if not variant_name: machine_container_map[definition_id] = container + continue variant_dict = {"variant_type": container.getMetaDataEntry("hardware_type", str(VariantType.NOZZLE)), "material_container": container} @@ -344,7 +345,7 @@ class XmlMaterialProfile(InstanceContainer): stream = io.BytesIO() tree = ET.ElementTree(root) # this makes sure that the XML header states encoding="utf-8" - tree.write(stream, encoding = "utf-8", xml_declaration=True) + tree.write(stream, encoding = "utf-8", xml_declaration = True) return stream.getvalue().decode("utf-8") From c71660cc114abf9a9f547d1ae11e0d0383ba40ab Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Aug 2019 16:21:30 +0200 Subject: [PATCH 268/994] Fix occasional crash when entering profiles section. Make QualityManagementModel into a singleton. part of CURA-6600 --- cura/CuraApplication.py | 11 +++++++++-- resources/qml/Preferences/ProfilesPage.qml | 23 ++++++++++------------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c452c56cf5..a70ca56da7 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -221,8 +221,9 @@ class CuraApplication(QtApplication): self._cura_scene_controller = None self._machine_error_checker = None - self._machine_settings_manager = MachineSettingsManager(self, parent = self) + self._machine_settings_manager = MachineSettingsManager(self, parent=self) self._material_management_model = MaterialManagementModel() + self._quality_management_model = None self._discovered_printer_model = DiscoveredPrintersModel(self, parent = self) self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self) @@ -981,6 +982,12 @@ class CuraApplication(QtApplication): def getMaterialManagementModel(self): return self._material_management_model + @pyqtSlot(result=QObject) + def getQualityManagementModel(self): + if not self._quality_management_model: + self._quality_management_model = QualityManagementModel() + return self._quality_management_model + def getSimpleModeSettingsManager(self, *args): if self._simple_mode_settings_manager is None: self._simple_mode_settings_manager = SimpleModeSettingsManager() @@ -1059,7 +1066,7 @@ class CuraApplication(QtApplication): qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel") qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel") qmlRegisterType(MaterialBrandsModel, "Cura", 1, 0, "MaterialBrandsModel") - qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel") + qmlRegisterSingletonType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel", self.getQualityManagementModel) qmlRegisterSingletonType(MaterialManagementModel, "Cura", 1, 5, "MaterialManagementModel", self.getMaterialManagementModel) qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel") diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 0bac5aefca..da41a0f23c 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -17,13 +17,10 @@ Item property QtObject qualityManager: CuraApplication.getQualityManager() property var resetEnabled: false // Keep PreferencesDialog happy property var extrudersModel: CuraApplication.getExtrudersModel() + property var qualityManagementModel: CuraApplication.getQualityManagementModel() UM.I18nCatalog { id: catalog; name: "cura"; } - Cura.QualityManagementModel { - id: qualitiesModel - } - Label { id: titleLabel anchors { @@ -40,7 +37,7 @@ Item property var currentItem: { var current_index = qualityListView.currentIndex; - return (current_index == -1) ? null : qualitiesModel.getItem(current_index); + return (current_index == -1) ? null : base.qualityManagementModel.getItem(current_index); } property var currentItemName: hasCurrentItem ? base.currentItem.name : "" @@ -195,7 +192,7 @@ Item // This connection makes sure that we will switch to the correct quality after the model gets updated Connections { - target: qualitiesModel + target: base.qualityManagementModel onItemsChanged: { var toSelectItemName = base.currentItem == null ? "" : base.currentItem.name; @@ -208,9 +205,9 @@ Item if (toSelectItemName != "") { // Select the required quality name if given - for (var idx = 0; idx < qualitiesModel.count; ++idx) + for (var idx = 0; idx < base.qualityManagementModel.count; ++idx) { - var item = qualitiesModel.getItem(idx); + var item = base.qualityManagementModel.getItem(idx); if (item.name == toSelectItemName) { // Switch to the newly created profile if needed @@ -282,7 +279,7 @@ Item id: importDialog title: catalog.i18nc("@title:window", "Import Profile") selectExisting: true - nameFilters: qualitiesModel.getFileNameFilters("profile_reader") + nameFilters: base.qualityManagementModel.getFileNameFilters("profile_reader") folder: CuraApplication.getDefaultPath("dialog_profile_path") onAccepted: { @@ -308,7 +305,7 @@ Item id: exportDialog title: catalog.i18nc("@title:window", "Export Profile") selectExisting: false - nameFilters: qualitiesModel.getFileNameFilters("profile_writer") + nameFilters: base.qualityManagementModel.getFileNameFilters("profile_writer") folder: CuraApplication.getDefaultPath("dialog_profile_path") onAccepted: { @@ -390,16 +387,16 @@ Item { id: qualityListView - model: qualitiesModel + model: base.qualityManagementModel Component.onCompleted: { var selectedItemName = Cura.MachineManager.activeQualityOrQualityChangesName; // Select the required quality name if given - for (var idx = 0; idx < qualitiesModel.count; idx++) + for (var idx = 0; idx < base.qualityManagementModel.count; idx++) { - var item = qualitiesModel.getItem(idx); + var item = base.qualityManagementModel.getItem(idx); if (item.name == selectedItemName) { currentIndex = idx; From 924d4cc13b5745492a4145311afedb135566628f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 16:07:37 +0200 Subject: [PATCH 269/994] Remove unused container_tree variable Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index cbdec39054..71a7f8e593 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -226,8 +226,6 @@ class XmlMaterialProfile(InstanceContainer): machine_container_map = {} # type: Dict[str, InstanceContainer] machine_variant_map = {} # type: Dict[str, Dict[str, Any]] - container_tree = ContainerTree.getInstance() - root_material_id = self.getMetaDataEntry("base_file") # if basefile is self.getId, this is a basefile. all_containers = registry.findInstanceContainers(base_file = root_material_id) From 1874a6453da603100633a7aa624c527fc398fdd9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 16:40:11 +0200 Subject: [PATCH 270/994] Move duplicateMaterial into MaterialManagementModel To move away from the deprecated MaterialManager class. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 4 +- .../Models/MaterialManagementModel.py | 68 ++++++++++++++++++- .../Preferences/Materials/MaterialsPage.qml | 2 +- 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 5d5938d95d..b055cf7ab4 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -298,7 +298,6 @@ class MaterialManager(QObject): # Create a new ID & container to hold the data. new_containers = [] - container_registry = CuraContainerRegistry.getInstance() if new_base_id is None: new_base_id = container_registry.uniqueName(base_container.getId()) new_base_container = copy.deepcopy(base_container) @@ -334,9 +333,10 @@ class MaterialManager(QObject): # if the duplicated material was favorite then the new material should also be added to favorite. if root_material_id in self.getFavorites(): - self.addFavorite(new_base_id) + cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().addFavorite(new_base_id) return new_base_id + # # Creates a duplicate of a material, which has the same GUID and base_file metadata. # Returns the root material ID of the duplicated material if successful. diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 2c8617073d..55ded501c2 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -1,11 +1,13 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import copy # To duplicate materials. from PyQt5.QtCore import QObject, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. -from typing import TYPE_CHECKING +from typing import Any, Dict, Optional, TYPE_CHECKING from UM.Logger import Logger +import cura.CuraApplication # Imported like this to prevent circular imports. from cura.Settings.CuraContainerRegistry import CuraContainerRegistry # To find the sets of materials belonging to each other, and currently loaded extruder stacks. if TYPE_CHECKING: @@ -62,4 +64,66 @@ class MaterialManagementModel(QObject): container_registry = CuraContainerRegistry.getInstance() materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file) for material_metadata in materials_this_base_file: - container_registry.removeContainer(material_metadata["id"]) \ No newline at end of file + container_registry.removeContainer(material_metadata["id"]) + + ## Creates a duplicate of a material with the same GUID and base_file + # metadata. + # \param material_node The node representing the material to duplicate. + # \param new_base_id A new material ID for the base material. The IDs of + # the submaterials will be based off this one. If not provided, a material + # ID will be generated automatically. + # \param new_metadata Metadata for the new material. If not provided, this + # will be duplicated from the original material. + # \return The root material ID of the duplicate material. + @pyqtSlot("QVariant", result = str) + def duplicateMaterial(self, material_node: "MaterialNode", new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + container_registry = CuraContainerRegistry.getInstance() + + root_materials = container_registry.findContainers(id = material_node.base_file) + if not root_materials: + Logger.log("i", "Unable to duplicate the root material with ID {root_id}, because it doesn't exist.".format(root_id = material_node.base_file)) + return None + root_material = root_materials[0] + + # Ensure that all settings are saved. + cura.CuraApplication.CuraApplication.getInstance().saveSettings() + + # Create a new ID and container to hold the data. + if new_base_id is None: + new_base_id = container_registry.uniqueName(root_material.getId()) + new_root_material = copy.deepcopy(root_material) + new_root_material.getMetaData()["id"] = new_base_id + new_root_material.getMetaData()["base_file"] = new_base_id + if new_metadata is not None: + new_root_material.getMetaData().update(new_metadata) + new_containers = [new_root_material] + + # Clone all submaterials. + for container_to_copy in container_registry.findInstanceContainers(base_file = material_node.base_file): + if container_to_copy.getId() == material_node.base_file: + continue # We already have that one. Skip it. + new_id = new_base_id + definition = container_to_copy.getMetaDataEntry("definition") + if definition != "fdmprinter": + new_id += "_" + definition + variant_name = container_to_copy.getMetaDataEntry("variant_name") + if variant_name: + new_id += "_" + variant_name.replace(" ", "_") + + new_container = copy.deepcopy(container_to_copy) + new_container.getMetaData()["id"] = new_id + new_container.getMetaData()["base_file"] = new_base_id + if new_metadata is not None: + new_container.getMetaData().update(new_metadata) + new_containers.append(new_container) + + for container_to_add in new_containers: + container_to_add.setDirty(True) + container_registry.addContainer(container_to_add) + + # If the duplicated material was favorite then the new material should also be added to the favorites. + # TODO: Move favourites to here. + #if material_node.base_file in self.getFavorites(): + # self.addFavorite(new_base_id) + + return new_base_id \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 4a6ff75f0d..1568e8707f 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -137,7 +137,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = base.materialManager.duplicateMaterial(base.currentItem.container_node); + base.newRootMaterialIdToSwitchTo = base.materialManagementModel.duplicateMaterial(base.currentItem.container_node); base.toActivateNewMaterial = true; } } From 957894b614e22cc3a96baf6a4c300051258cb726 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 16:45:50 +0200 Subject: [PATCH 271/994] Fix duplicating a favourite material The duplicate must also be favourite. Contributes to issue CURA-6600. --- cura/Machines/Models/MaterialManagementModel.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 55ded501c2..301dc12025 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -86,7 +86,8 @@ class MaterialManagementModel(QObject): root_material = root_materials[0] # Ensure that all settings are saved. - cura.CuraApplication.CuraApplication.getInstance().saveSettings() + application = cura.CuraApplication.CuraApplication.getInstance() + application.saveSettings() # Create a new ID and container to hold the data. if new_base_id is None: @@ -122,8 +123,9 @@ class MaterialManagementModel(QObject): container_registry.addContainer(container_to_add) # If the duplicated material was favorite then the new material should also be added to the favorites. - # TODO: Move favourites to here. - #if material_node.base_file in self.getFavorites(): - # self.addFavorite(new_base_id) + favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";")) + if material_node.base_file in favorites_set: + favorites_set.add(new_base_id) + application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set)) return new_base_id \ No newline at end of file From cb344f9dec5362c334c033be45d4388ef819d60a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:05:46 +0200 Subject: [PATCH 272/994] Fix serialising materials without nozzle profile again Oops. This is simpler anyway. Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 71a7f8e593..5ec14fe60c 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -245,7 +245,7 @@ class XmlMaterialProfile(InstanceContainer): machine_container_map[definition_id] = container continue - variant_dict = {"variant_type": container.getMetaDataEntry("hardware_type", str(VariantType.NOZZLE)), + variant_dict = {"variant_type": container.getMetaDataEntry("hardware_type", "nozzle"), "material_container": container} machine_variant_map[definition_id][variant_name] = variant_dict From 39523667984e46c2f214c0791bda4f19e0faa105 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:08:56 +0200 Subject: [PATCH 273/994] Move createMaterial to MaterialManagementModel and simplify it a bit We can reuse our duplicateMaterial function again but in a simpler way. Also finding the preferred material is simpler with our container tree. However there seems to be a problem with finding the preferred material; it's not finding generic_pla for UM3 and AA0.4 anyway, and then falls back on a random material. This needs to be fixed in the variant node class. Contributes to issue CURA-6600. --- .../Models/MaterialManagementModel.py | 37 ++++++++++++++++++- .../Preferences/Materials/MaterialsPage.qml | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 301dc12025..6ff836cef2 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -4,15 +4,20 @@ import copy # To duplicate materials. from PyQt5.QtCore import QObject, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. from typing import Any, Dict, Optional, TYPE_CHECKING +import uuid # To generate new GUIDs for new materials. +from UM.i18n import i18nCatalog from UM.Logger import Logger import cura.CuraApplication # Imported like this to prevent circular imports. +from cura.Machines.ContainerTree import ContainerTree from cura.Settings.CuraContainerRegistry import CuraContainerRegistry # To find the sets of materials belonging to each other, and currently loaded extruder stacks. if TYPE_CHECKING: from cura.Machines.MaterialNode import MaterialNode +catalog = i18nCatalog("cura") + ## Proxy class to the materials page in the preferences. # # This class handles the actions in that page, such as creating new materials, @@ -128,4 +133,34 @@ class MaterialManagementModel(QObject): favorites_set.add(new_base_id) application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set)) - return new_base_id \ No newline at end of file + return new_base_id + + ## Create a new material by cloning the preferred material for the current + # material diameter and generate a new GUID. + # + # The material type is explicitly left to be the one from the preferred + # material, since this allows the user to still have SOME profiles to work + # with. + # \return The ID of the newly created material. + @pyqtSlot(result = str) + def createMaterial(self) -> str: + # Ensure all settings are saved. + application = cura.CuraApplication.CuraApplication.getInstance() + application.saveSettings() + + # Find the preferred material. + extruder_stack = application.getMachineManager().activeStack + active_variant_name = extruder_stack.variant.getName() + approximate_diameter = str(extruder_stack.approximateMaterialDiameter) + machine_node = ContainerTree.getInstance().machines[application.getGlobalContainerStack().definition.getId()] + preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter) + + # Create a new ID & new metadata for the new material. + new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material") + new_metadata = {"name": catalog.i18nc("@label", "Custom Material"), + "brand": catalog.i18nc("@label", "Custom"), + "GUID": str(uuid.uuid4()), + } + + self.duplicateMaterial(preferred_material_node, new_base_id = new_id, new_metadata = new_metadata) + return new_id \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 1568e8707f..6e637a8d1f 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -122,7 +122,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = base.materialManager.createMaterial(); + base.newRootMaterialIdToSwitchTo = base.materialManagementModel.createMaterial(); base.toActivateNewMaterial = true; } } From 9297890d78ec78d522f88e2b65480870a1e6576f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:21:05 +0200 Subject: [PATCH 274/994] Fix typing of approximate diameter and add typing to function for it Seems I forgot to add typing and that's biting my bum right now. Contributes to issue CURA-6600. --- cura/Machines/Models/MaterialManagementModel.py | 2 +- cura/Machines/VariantNode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 6ff836cef2..90e63e6240 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -151,7 +151,7 @@ class MaterialManagementModel(QObject): # Find the preferred material. extruder_stack = application.getMachineManager().activeStack active_variant_name = extruder_stack.variant.getName() - approximate_diameter = str(extruder_stack.approximateMaterialDiameter) + approximate_diameter = int(extruder_stack.approximateMaterialDiameter) machine_node = ContainerTree.getInstance().machines[application.getGlobalContainerStack().definition.getId()] preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index f5a1e3006e..abcd588c4a 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -79,7 +79,7 @@ class VariantNode(ContainerNode): # material. # \return The node for the preferred material, or any arbitrary material # if there is no match. - def preferredMaterial(self, approximate_diameter) -> MaterialNode: + def preferredMaterial(self, approximate_diameter: int) -> MaterialNode: for base_material, material_node in self.materials.items(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node From 745390e51fe2fc761ba11aa8b79aa5ab7dc4388a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Aug 2019 17:57:11 +0200 Subject: [PATCH 275/994] Fix typing. part CURA-6600 --- cura/Machines/MachineNode.py | 7 +++++-- cura/Machines/MaterialManager.py | 15 +++++++++++++-- cura/Machines/Models/BaseMaterialsModel.py | 5 ++++- cura/Machines/QualityChangesGroup.py | 2 +- cura/Machines/QualityGroup.py | 7 +++++++ cura/Machines/QualityManager.py | 10 ++++------ cura/Settings/ContainerManager.py | 6 ++++++ cura/Settings/CuraContainerRegistry.py | 4 ++-- cura/Settings/MachineManager.py | 8 ++++++-- tests/TestQualityManager.py | 7 ------- 10 files changed, 48 insertions(+), 23 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index efc5b0f128..ac293a1503 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -77,6 +77,9 @@ class MachineNode(ContainerNode): # Create the quality group for each available type. quality_groups = {} for quality_type, global_quality_node in self.global_qualities.items(): + if not global_quality_node.container: + Logger.log("w", "Node {0} doesn't have a container.".format(global_quality_node.container_id)) + continue quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): @@ -116,7 +119,7 @@ class MachineNode(ContainerNode): def getQualityChangesGroups(self, variant_names: List[str], material_bases: List[str], extruder_enabled: List[bool]) -> List[QualityChangesGroup]: machine_quality_changes = ContainerRegistry.getInstance().findContainersMetadata(type = "quality_changes", definition = self.quality_definition) # All quality changes for each extruder. - groups_by_name = {} # Group quality changes profiles by their display name. The display name must be unique for quality changes. This finds profiles that belong together in a group. + groups_by_name = {} #type: Dict[str, QualityChangesGroup] # Group quality changes profiles by their display name. The display name must be unique for quality changes. This finds profiles that belong together in a group. for quality_changes in machine_quality_changes: name = quality_changes["name"] if name not in groups_by_name: @@ -143,7 +146,7 @@ class MachineNode(ContainerNode): # quality is taken. # If there are no global qualities, an empty quality is returned. def preferredGlobalQuality(self) -> QualityNode: - return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities))) + return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) ## (Re)loads all variants under this printer. def _loadAll(self): diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 5d5938d95d..e298ef7389 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -132,7 +132,7 @@ class MaterialManager(QObject): # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. materials = self.getAvailableMaterials(machine.definition.getId(), nozzle_name) compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) - result = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + result = {key: material for key, material in materials.items() if material.container and material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} return result # @@ -268,6 +268,8 @@ class MaterialManager(QObject): @pyqtSlot("QVariant", str) def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: + if material_node.container is None: + return root_material_id = material_node.container.getMetaDataEntry("base_file") if root_material_id is None: return @@ -279,6 +281,8 @@ class MaterialManager(QObject): @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: + if material_node.container is None: + return root_material_id = material_node.container.getMetaDataEntry("base_file") if root_material_id is not None: self.removeMaterialByRootId(root_material_id) @@ -343,6 +347,9 @@ class MaterialManager(QObject): # @pyqtSlot("QVariant", result = str) def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + if material_node.container is None: + Logger.log("e", "Material node {0} doesn't have container.".format(material_node.container_id)) + return "ERROR" root_material_id = cast(str, material_node.container.getMetaDataEntry("base_file", "")) return self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) @@ -359,7 +366,11 @@ class MaterialManager(QObject): machine_manager = application.getMachineManager() extruder_stack = machine_manager.activeStack - machine_definition = application.getGlobalContainerStack().definition + global_stack = application.getGlobalContainerStack() + if global_stack is None: + Logger.log("e", "Global stack not present!") + return "ERROR" + machine_definition = global_stack.definition root_material_id = machine_definition.getMetaDataEntry("preferred_material", default = "generic_pla") approximate_diameter = str(extruder_stack.approximateMaterialDiameter) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 81be676a33..0a5e58d52f 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -106,7 +106,10 @@ class BaseMaterialsModel(ListModel): def _materialsListChanged(self, material: MaterialNode) -> None: if material.variant.container_id != self._extruder_stack.variant.getId(): return - if material.variant.machine.container_id != cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack().definition.getId(): + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack: + return + if material.variant.machine.container_id != global_stack.definition.getId(): return self._update() diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index f798a18e29..65ebb71f4c 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -16,7 +16,7 @@ class QualityChangesGroup(QObject): self.quality_type = quality_type self.intent_category = intent_category self.is_available = False - self.metadata_for_global = None # type: Optional[str] + self.metadata_for_global = {} # type: Dict[str, Any] self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] def __str__(self) -> str: diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index a4324e069d..951d3717de 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -5,6 +5,7 @@ from typing import Dict, Optional, List, Set from PyQt5.QtCore import QObject, pyqtSlot +from UM.Logger import Logger from UM.Util import parseBool from cura.Machines.ContainerNode import ContainerNode @@ -60,6 +61,9 @@ class QualityGroup(QObject): self.node_for_global = node # Update is_experimental flag + if not node.container: + Logger.log("w", "Node {0} doesn't have a container.".format(node.container_id)) + return is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental @@ -67,5 +71,8 @@ class QualityGroup(QObject): self.nodes_for_extruders[position] = node # Update is_experimental flag + if not node.container: + Logger.log("w", "Node {0} doesn't have a container.".format(node.container_id)) + return is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index c03c580197..75c8e89e11 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -112,12 +112,10 @@ class QualityManager(QObject): # Iterate over all quality_types in the machine node quality_group_dict = dict() for node in nodes_to_check: - if node and node.quality_type_map: - for quality_type, quality_node in node.quality_type_map.items(): - quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) - quality_group.setGlobalNode(quality_node) - quality_group_dict[quality_type] = quality_group - break + if node and node.quality_type: + quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type) + quality_group.setGlobalNode(node) + quality_group_dict[node.quality_type] = quality_group return quality_group_dict diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index a4c75353f5..d1c25530e3 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -83,6 +83,9 @@ class ContainerManager(QObject): # Update: In order for QML to use objects and sub objects, those (sub) objects must all be QObject. Is that what we want? @pyqtSlot("QVariant", str, str) def setContainerMetaDataEntry(self, container_node: "ContainerNode", entry_name: str, entry_value: str) -> bool: + if container_node.container is None: + Logger.log("w", "Container node {0} doesn't have a container.".format(container_node.container_id)) + return False root_material_id = container_node.container.getMetaDataEntry("base_file", "") if cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) @@ -341,6 +344,9 @@ class ContainerManager(QObject): @pyqtSlot("QVariant") def unlinkMaterial(self, material_node: "MaterialNode") -> None: # Get the material group + if material_node.container is None: + Logger.log("w", "Material node {0} doesn't have a container.".format(material_node.container_id)) + return material_group = MaterialManager.getInstance().getMaterialGroup(material_node.container.getMetaDataEntry("base_file", "")) if material_group is None: diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 314adeeb54..c288f3c0ce 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -28,6 +28,7 @@ from . import GlobalStack import cura.CuraApplication from cura.Settings.cura_empty_instance_containers import empty_quality_container +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch from cura.ReaderWriters.ProfileReader import NoProfileException, ProfileReader @@ -386,8 +387,7 @@ class CuraContainerRegistry(ContainerRegistry): # Check to make sure the imported profile actually makes sense in context of the current configuration. # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as # successfully imported but then fail to show up. - quality_manager = cura.CuraApplication.CuraApplication.getInstance()._quality_manager - quality_group_dict = quality_manager.getQualityGroupsForMachineDefinition(global_stack) + quality_group_dict = ContainerTree.getInstance().machines[definition_id] # "not_supported" profiles can be imported. if quality_type != empty_quality_container.getMetaDataEntry("quality_type") and quality_type not in quality_group_dict: return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3447581bca..5ad1c2dc43 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -24,6 +24,7 @@ from UM.Signal import postponeSignals, CompressTechnique import cura.CuraApplication # Imported like this to prevent circular references. +from cura.Machines.ContainerNode import ContainerNode from cura.Machines.ContainerTree import ContainerTree from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.Machines.MaterialManager import MaterialManager @@ -1185,7 +1186,7 @@ class MachineManager(QObject): def _setMaterial(self, position: str, material_node: Optional["MaterialNode"] = None) -> None: if self._global_container_stack is None: return - if material_node: + if material_node and material_node.container: material_container = material_node.container self._global_container_stack.extruders[position].material = material_container root_material_id = material_container.getMetaDataEntry("base_file", None) @@ -1239,6 +1240,9 @@ class MachineManager(QObject): # The current quality type is not available so we use the preferred quality type if it's available, # otherwise use one of the available quality types. quality_type = sorted(list(available_quality_types))[0] + if self._global_container_stack is None: + Logger.log("e", "Global stack not present!") + return preferred_quality_type = self._global_container_stack.getMetaDataEntry("preferred_quality_type") if preferred_quality_type in available_quality_types: quality_type = preferred_quality_type @@ -1549,7 +1553,7 @@ class MachineManager(QObject): @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - return global_container_stack and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container + return (not global_container_stack is None) and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container def _updateUponMaterialMetadataChange(self) -> None: if self._global_container_stack is None: diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py index 4a0f29c9ee..52c3da4fbb 100644 --- a/tests/TestQualityManager.py +++ b/tests/TestQualityManager.py @@ -50,13 +50,6 @@ def test_getQualityGroups(quality_mocked_application): assert "normal" in manager.getQualityGroups(mocked_stack) -def test_getQualityGroupsForMachineDefinition(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - - assert "normal" in manager.getQualityGroupsForMachineDefinition(mocked_stack) - - def test_getQualityChangesGroup(quality_mocked_application): manager = QualityManager(quality_mocked_application) manager.initialize() From 21412986d3cbb73cfc3c5108ac93fdd226eec2a3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:28:26 +0200 Subject: [PATCH 276/994] Remove material manager from MaterialsPage It is no longer used now that everything relevant has been moved to a separate class for this page specifically. Contributes to issue CURA-6600. --- resources/qml/Preferences/Materials/MaterialsPage.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 6e637a8d1f..a8de240924 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -17,7 +17,6 @@ Item property var resetEnabled: false property var currentItem: null - property var materialManager: CuraApplication.getMaterialManager() property var materialManagementModel: CuraApplication.getMaterialManagementModel() property var hasCurrentItem: base.currentItem != null From f5ca29c7aa6bb6af51b6c0342474c098e446e93c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:36:27 +0200 Subject: [PATCH 277/994] Emit materialsChanged from the variant when a material gets added This allows the material models to update themselves. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 3 +-- cura/Machines/VariantNode.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 0a5e58d52f..d62b848343 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -96,7 +96,7 @@ class BaseMaterialsModel(ListModel): self._update() self.enabledChanged.emit() - @pyqtProperty(bool, fset=setEnabled, notify=enabledChanged) + @pyqtProperty(bool, fset = setEnabled, notify = enabledChanged) def enabled(self): return self._enabled @@ -169,4 +169,3 @@ class BaseMaterialsModel(ListModel): "is_favorite": root_material_id in self._favorite_ids } return item - diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index abcd588c4a..7262ccfb58 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -127,4 +127,5 @@ class VariantNode(ContainerNode): if "empty_material" in self.materials: del self.materials["empty_material"] self.materials[base_file] = MaterialNode(container.getId(), variant = self) - self.materials[base_file].materialChanged.connect(self.materialsChanged) \ No newline at end of file + self.materials[base_file].materialChanged.connect(self.materialsChanged) + self.materialsChanged.emit(self.materials[base_file]) \ No newline at end of file From 0398c404fb9228da3dc7436f82497b10d78aa04c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 18:01:19 +0200 Subject: [PATCH 278/994] Update tree when material gets deleted Contributes to issue CURA-6600. --- cura/Machines/VariantNode.py | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 7262ccfb58..00be1e3807 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -33,10 +33,11 @@ class VariantNode(ContainerNode): container_registry = ContainerRegistry.getInstance() self.variant_name = container_registry.findContainersMetadata(id = container_id)[0]["name"] # Store our own name so that we can filter more easily. container_registry.containerAdded.connect(self._materialAdded) + container_registry.containerRemoved.connect(self._materialRemoved) self._loadAll() ## (Re)loads all materials under this variant. - def _loadAll(self): + def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() if not self.machine.has_materials: @@ -55,10 +56,8 @@ class VariantNode(ContainerNode): materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. materials = materials_per_base_file.values() - filtered_materials = [] - for material in materials: - if material["id"] not in self.machine.exclude_materials: - filtered_materials.append(material) + # Filter materials based on the exclude_materials property. + filtered_materials = [material for material in materials if material["id"] not in self.machine.exclude_materials] for material in filtered_materials: base_file = material["base_file"] @@ -94,7 +93,7 @@ class VariantNode(ContainerNode): ## When a material gets added to the set of profiles, we need to update our # tree here. - def _materialAdded(self, container: ContainerInterface): + def _materialAdded(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "material": return # Not interested. if not self.machine.has_materials: @@ -128,4 +127,33 @@ class VariantNode(ContainerNode): del self.materials["empty_material"] self.materials[base_file] = MaterialNode(container.getId(), variant = self) self.materials[base_file].materialChanged.connect(self.materialsChanged) - self.materialsChanged.emit(self.materials[base_file]) \ No newline at end of file + self.materialsChanged.emit(self.materials[base_file]) + + def _materialRemoved(self, container: ContainerInterface) -> None: + if container.getMetaDataEntry("type") != "material": + return # Only interested in materials. + base_file = container.getMetaDataEntry("base_file") + if base_file not in self.materials: + return # We don't track this material anyway. No need to remove it. + + original_node = self.materials[base_file] + del self.materials[base_file] + self.materialsChanged.emit(original_node) + + # Now a different material from the same base file may have been hidden because it was not as specific as the one we deleted. + # Search for any submaterials from that base file that are still left. + materials_same_base_file = ContainerRegistry.getInstance().findContainersMetadata(base_file = base_file) + if materials_same_base_file: + most_specific_submaterial = materials_same_base_file[0] + for submaterial in materials_same_base_file: + if submaterial["definition"] == self.machine.container_id: + if most_specific_submaterial["definition"] == "fdmprinter": + most_specific_submaterial = submaterial + if most_specific_submaterial.get("variant", "empty") == "empty" and submaterial.get("variant", "empty") == self.variant_name: + most_specific_submaterial = submaterial + self.materials[base_file] = MaterialNode(most_specific_submaterial["id"], variant = self) + self.materialsChanged.emit(self.materials[base_file]) + + if not self.materials: # The last available material just got deleted and there is nothing with the same base file to replace it. + self.materials["empty_material"] = MaterialNode("empty_material", variant = self) + self.materialsChanged.emit(self.materials["empty_material"]) \ No newline at end of file From 944d1090cf0e16034ad47394f214380d2a7d8eaa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 08:42:39 +0200 Subject: [PATCH 279/994] Use ContainerTree to get current quality groups and MachineManager to update This removes all dependencies from the quality manager. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index aa2cb3ba5f..dbe2a94033 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -28,10 +28,9 @@ class QualityManagementModel(ListModel): self._container_registry = CuraApplication.getInstance().getContainerRegistry() self._machine_manager = CuraApplication.getInstance().getMachineManager() self._extruder_manager = CuraApplication.getInstance().getExtruderManager() - self._quality_manager = CuraApplication.getInstance().getQualityManager() self._machine_manager.globalContainerChanged.connect(self._update) - self._quality_manager.qualitiesUpdated.connect(self._update) + self._machine_manager.activeQualityGroupChanged.connect(self._onChange) self._update() @@ -43,8 +42,9 @@ class QualityManagementModel(ListModel): self.setItems([]) return - quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() - quality_changes_group_list = self._quality_manager.getQualityChangesGroups(global_stack) + container_tree = ContainerTree.getInstance() + quality_group_dict = container_tree.getCurrentQualityGroups() + quality_changes_group_list = container_tree.getCurrentQualityChangesGroups() available_quality_types = set(quality_type for quality_type, quality_group in quality_group_dict.items() if quality_group.is_available) From 972531b0a6db361779a1708c4df56db63635a4ab Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 08:49:28 +0200 Subject: [PATCH 280/994] No longer update upon switching active profile It's not necessary since our model doesn't depend on that. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index dbe2a94033..792159b31d 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -5,6 +5,7 @@ from PyQt5.QtCore import Qt, pyqtSlot from UM.Logger import Logger from UM.Qt.ListModel import ListModel +import cura.CuraApplication # Imported this way to prevent circular imports. from cura.Machines.ContainerTree import ContainerTree # @@ -24,13 +25,12 @@ class QualityManagementModel(ListModel): self.addRoleName(self.QualityGroupRole, "quality_group") self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") - from cura.CuraApplication import CuraApplication - self._container_registry = CuraApplication.getInstance().getContainerRegistry() - self._machine_manager = CuraApplication.getInstance().getMachineManager() - self._extruder_manager = CuraApplication.getInstance().getExtruderManager() + application = cura.CuraApplication.CuraApplication.getInstance() + self._container_registry = application.getContainerRegistry() + self._machine_manager = application.getMachineManager() + self._extruder_manager = application.getExtruderManager() self._machine_manager.globalContainerChanged.connect(self._update) - self._machine_manager.activeQualityGroupChanged.connect(self._onChange) self._update() From b2cee850c971c84896cf48c4ce99ea83f20222a8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 08:58:03 +0200 Subject: [PATCH 281/994] Use container tree to find current available quality groups Contributes to issue CURA-6600. --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index d5fa1cb272..873d5e8fae 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -23,6 +23,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.Job import Job from UM.Preferences import Preferences +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType from cura.Settings.CuraStackBuilder import CuraStackBuilder @@ -992,8 +993,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): def _updateActiveMachine(self, global_stack): # Actually change the active machine. machine_manager = Application.getInstance().getMachineManager() - material_manager = Application.getInstance().getMaterialManager() - quality_manager = Application.getInstance().getQualityManager() + container_tree = ContainerTree.getInstance() machine_manager.setActiveMachine(global_stack.getId()) @@ -1003,7 +1003,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): global_stack.setMetaDataEntry(key, value) if self._quality_changes_to_apply: - quality_changes_group_list = quality_manager.getQualityChangesGroups(global_stack) + quality_changes_group_list = container_tree.getCurrentQualityChangesGroups() quality_changes_group = next((qcg for qcg in quality_changes_group_list if qcg.name == self._quality_changes_to_apply), None) if not quality_changes_group: Logger.log("e", "Could not find quality_changes [%s]", self._quality_changes_to_apply) @@ -1011,13 +1011,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader): machine_manager.setQualityChangesGroup(quality_changes_group, no_dialog = True) else: self._quality_type_to_apply = self._quality_type_to_apply.lower() - quality_group_dict = quality_manager.getQualityGroups(global_stack) + quality_group_dict = container_tree.getCurrentQualityGroups() if self._quality_type_to_apply in quality_group_dict: quality_group = quality_group_dict[self._quality_type_to_apply] else: Logger.log("i", "Could not find quality type [%s], switch to default", self._quality_type_to_apply) preferred_quality_type = global_stack.getMetaDataEntry("preferred_quality_type") - quality_group_dict = quality_manager.getQualityGroups(global_stack) quality_group = quality_group_dict.get(preferred_quality_type) if quality_group is None: Logger.log("e", "Could not get preferred quality type [%s]", preferred_quality_type) From 4fd886f2e8dd3e1de605101050653e3250705075 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 09:02:26 +0200 Subject: [PATCH 282/994] Use container tree to get current quality groups Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5ad1c2dc43..406ae0bdba 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1135,9 +1135,8 @@ class MachineManager(QObject): # A custom quality can be created based on "not supported". # In that case, do not set quality containers to empty. quality_group = None - if quality_type != "not_supported": - quality_group_dict = QualityManager.getInstance().getQualityGroups(self._global_container_stack) - quality_group = quality_group_dict.get(quality_type) + if quality_type != "not_supported": # Find the quality group that the quality changes was based on. + quality_group = ContainerTree.getInstance().getCurrentQualityGroups().get(quality_type) if quality_group is None: self._fixQualityChangesGroupToNotSupported(quality_changes_group) From 83c8b814d9a7e3922aee133854a880f6c9de5181 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 10:33:33 +0200 Subject: [PATCH 283/994] Apply intent category when changing to quality changes group This essentially makes the quality changes depend on the intent that was active when it was created. Contributes to issue CURA-6600. --- cura/Machines/IntentNode.py | 5 ++++- cura/Settings/MachineManager.py | 29 ++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index 232498536c..8ec8dd6d6b 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -3,6 +3,8 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry + from cura.Machines.ContainerNode import ContainerNode if TYPE_CHECKING: @@ -14,4 +16,5 @@ if TYPE_CHECKING: class IntentNode(ContainerNode): def __init__(self, container_id: str, quality: "QualityNode") -> None: super().__init__(container_id) - self.quality = quality \ No newline at end of file + self.quality = quality + self.intent_category = ContainerRegistry.getInstance().findContainersMetadata(id = container_id)[0].get("intent_category", "default") \ No newline at end of file diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 406ae0bdba..57ec0003cd 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -38,7 +38,7 @@ from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderStack import ExtruderStack from cura.Settings.cura_empty_instance_containers import (empty_definition_changes_container, empty_variant_container, empty_material_container, empty_quality_container, - empty_quality_changes_container) + empty_quality_changes_container, empty_intent_container) from .CuraStackBuilder import CuraStackBuilder @@ -1127,6 +1127,7 @@ class MachineManager(QObject): if container: container.setMetaDataEntry("quality_type", "not_supported") quality_changes_group.quality_type = "not_supported" + quality_changes_group.intent_category = "default" def _setQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: if self._global_container_stack is None: @@ -1166,6 +1167,8 @@ class MachineManager(QObject): extruder.quality = quality_container extruder.qualityChanges = quality_changes_container + self.setIntentByCategory(quality_changes_group.intent_category) + self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() @@ -1498,6 +1501,30 @@ class MachineManager(QObject): if not no_dialog and self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() + ## Change the intent category of the current printer. + # + # All extruders can change their profiles. If an intent profile is + # available with the desired intent category, that one will get chosen. + # Otherwise the intent profile will be left to the empty profile, which + # represents the "default" intent category. + # \param intent_category The intent category to change to. + def setIntentByCategory(self, intent_category: str) -> None: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + container_tree = ContainerTree.getInstance() + for extruder in global_stack.extruderList: + definition_id = global_stack.definition.getId() + variant_name = extruder.variant.getName() + material_base_file = extruder.material.getMetaDataEntry("base_file") + quality_id = extruder.quality.getId() + quality_node = container_tree.machines[definition_id].variants[variant_name].materials[material_base_file].qualities[quality_id] + + for intent_node in quality_node.intents.values(): + if intent_node.intent_category == intent_category: # Found an intent with the correct category. + extruder.intent = intent_node.container + break + else: # No intent had the correct category. + extruder.intent = empty_intent_container + @pyqtProperty(QObject, fset = setQualityGroup, notify = activeQualityGroupChanged) def activeQualityGroup(self) -> Optional["QualityGroup"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() From 64a8aff6277cfacaac96d06872a924c00e0c6016 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 10:35:56 +0200 Subject: [PATCH 284/994] Remove usage of deprecated getContainer() function This was the last place where it was used in our code base. Contributes to issue CURA-6600. --- cura/Machines/Models/QualitySettingsModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 796d11fb87..f0f7a55228 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt @@ -93,8 +93,8 @@ class QualitySettingsModel(ListModel): quality_node = quality_group.nodes_for_extruders.get(str(self._selected_position)) settings_keys = quality_group.getAllKeys() quality_containers = [] - if quality_node is not None and quality_node.getContainer() is not None: - quality_containers.append(quality_node.getContainer()) + if quality_node is not None and quality_node.container is not None: + quality_containers.append(quality_node.container) # Here, if the user has selected a quality changes, then "quality_changes_group" will not be None, and we fetch # the settings in that quality_changes_group. From c9191beb6158fc5a341661b1ddced8705548e99c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 11:11:13 +0200 Subject: [PATCH 285/994] Fix updating intents list when printer changes Contributes to issue CURA-6600. --- cura/Machines/Models/IntentModel.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 5a44883b76..c61d0bfcca 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -6,7 +6,6 @@ from typing import Optional, List, Dict, Any from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal from UM.Qt.ListModel import ListModel -from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Machines.ContainerTree import ContainerTree from cura.Settings.IntentManager import IntentManager @@ -25,9 +24,9 @@ class IntentModel(ListModel): self._intent_category = "engineering" - ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) - ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) - + machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() + machine_manager.globalContainerChanged.connect(self._update) + machine_manager.activeStackChanged.connect(self._update) self._update() intentCategoryChanged = pyqtSignal() @@ -42,10 +41,6 @@ class IntentModel(ListModel): def intentCategory(self) -> str: return self._intent_category - def _onChanged(self, container): - if container.getMetaDataEntry("type") == "intent": - self._update() - def _update(self) -> None: new_items = [] # type: List[Dict[str, Any]] global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() From 5a7054ecc330d4019715205bfee5d91354d2e42e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:16:39 +0200 Subject: [PATCH 286/994] Remove references to quality manager The last two remaining here. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 57ec0003cd..6adcd8cb3a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -26,7 +26,6 @@ import cura.CuraApplication # Imported like this to prevent circular references from cura.Machines.ContainerNode import ContainerNode from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.Machines.MaterialManager import MaterialManager from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType @@ -696,9 +695,10 @@ class MachineManager(QObject): # \returns DefinitionID (string) if found, empty string otherwise @pyqtProperty(str, notify = globalContainerChanged) def activeQualityDefinitionId(self) -> str: - if self._global_container_stack: - return getMachineDefinitionIDForQualitySearch(self._global_container_stack.definition) - return "" + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack: + return "" + return ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition ## Gets how the active definition calls variants # Caveat: per-definition-variant-title is currently not translated (though the fallback is) @@ -1468,9 +1468,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return # Get all the quality groups for this global stack and filter out by quality_type - quality_group_dict = self._application.getQualityManager().getQualityGroups(self._global_container_stack) - quality_group = quality_group_dict[quality_type] - self.setQualityGroup(quality_group) + self.setQualityGroup(ContainerTree.getInstance().getCurrentQualityGroups()[quality_type]) ## Optionally provide global_stack if you want to use your own # The active global_stack is treated differently. From 6dd03336269e53821ac6317071f342f534369904 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:21:23 +0200 Subject: [PATCH 287/994] Use container tree instead of getMachineDefinitionIdForQualitySearch It's in the metadata there, so use it. Contributes to issue CURA-6600. --- cura/Settings/CuraContainerRegistry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index c288f3c0ce..918e6a5257 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -381,7 +381,8 @@ class CuraContainerRegistry(ContainerRegistry): global_stack = Application.getInstance().getGlobalContainerStack() if global_stack is None: return None - definition_id = getMachineDefinitionIDForQualitySearch(global_stack.definition) + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + definition_id = machine_node.quality_definition profile.setDefinition(definition_id) # Check to make sure the imported profile actually makes sense in context of the current configuration. From 61e13087cd7a7503db4daf104ae2e7bec023cf14 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:26:18 +0200 Subject: [PATCH 288/994] Fix testing for available quality types Contributes to issue CURA-6600. --- cura/Settings/CuraContainerRegistry.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 918e6a5257..4cf311f5ca 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -381,14 +381,13 @@ class CuraContainerRegistry(ContainerRegistry): global_stack = Application.getInstance().getGlobalContainerStack() if global_stack is None: return None - machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] - definition_id = machine_node.quality_definition + definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition profile.setDefinition(definition_id) # Check to make sure the imported profile actually makes sense in context of the current configuration. # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as # successfully imported but then fail to show up. - quality_group_dict = ContainerTree.getInstance().machines[definition_id] + quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() # "not_supported" profiles can be imported. if quality_type != empty_quality_container.getMetaDataEntry("quality_type") and quality_type not in quality_group_dict: return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type) From a05f077df8a9b5303eaf6e38d4525fe1d09a312d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:35:49 +0200 Subject: [PATCH 289/994] Use fdmprinter for machines that don't have printer-specific qualities This encodes the behaviour of QualityManager.getMachineDefinitionIDForQualitySearch. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index ac293a1503..e7930b6a1f 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -36,7 +36,7 @@ class MachineNode(ContainerNode): self.has_variants = parseBool(my_metadata.get("has_variants", "false")) self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) - self.quality_definition = my_metadata.get("quality_definition", container_id) + self.quality_definition = my_metadata.get("quality_definition", container_id) if self.has_machine_quality else "fdmprinter" self.exclude_materials = my_metadata.get("exclude_materials", []) self.preferred_variant_name = my_metadata.get("preferred_variant_name", "") self.preferred_material = my_metadata.get("preferred_material", "") From 24fd67c36097429e1e2d4ae6fc20f193619b2f5d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:53:21 +0200 Subject: [PATCH 290/994] Also try looking for material-specific profiles, not just by type Type is only a fallback after the exact ID match. This way we can also have profiles specific to Ultimaker PLA Red and such in the future. Contributes to issue CURA-6600. --- cura/Machines/MaterialNode.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index a5a3bd8e72..988adeb830 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -62,15 +62,16 @@ class MaterialNode(ContainerNode): qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") else: # Need to find the qualities that specify a material profile with the same material type. - my_material_type = self.material_type - qualities = [] - qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) - for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): - qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) - if not qualities: # No quality profiles found. Go by GUID then. - my_guid = self.guid - for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. + if not qualities: + my_material_type = self.material_type + qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) + for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) + if not qualities: # No quality profiles found. Go by GUID then. + my_guid = self.guid + for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): + qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) for quality in qualities: quality_id = quality["id"] From ae77f9124c7e417e79812d4c42956e224f17a430 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:55:11 +0200 Subject: [PATCH 291/994] Use container tree to determine quality_definition of profile and printer To see if they match. Contributes to issue CURA-6600. --- cura/Settings/CuraContainerRegistry.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 4cf311f5ca..c551431882 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -178,6 +178,7 @@ class CuraContainerRegistry(ContainerRegistry): global_stack = Application.getInstance().getGlobalContainerStack() if not global_stack: return {"status": "error", "message": catalog.i18nc("@info:status Don't translate the XML tags !", "Can't import profile from {0} before a printer is added.", file_name)} + container_tree = ContainerTree.getInstance() machine_extruders = [] for position in sorted(global_stack.extruders): @@ -227,7 +228,7 @@ class CuraContainerRegistry(ContainerRegistry): # Make sure we have a profile_definition in the file: if profile_definition is None: break - machine_definitions = self.findDefinitionContainers(id = profile_definition) + machine_definitions = self.findContainers(id = profile_definition) if not machine_definitions: Logger.log("e", "Incorrect profile [%s]. Unknown machine type [%s]", file_name, profile_definition) return {"status": "error", @@ -237,8 +238,8 @@ class CuraContainerRegistry(ContainerRegistry): # Get the expected machine definition. # i.e.: We expect gcode for a UM2 Extended to be defined as normal UM2 gcode... - profile_definition = getMachineDefinitionIDForQualitySearch(machine_definition) - expected_machine_definition = getMachineDefinitionIDForQualitySearch(global_stack.definition) + profile_definition = container_tree.machines[machine_definition.getId()].quality_definition + expected_machine_definition = container_tree.machines[global_stack.definition.getId()].quality_definition # And check if the profile_definition matches either one (showing error if not): if profile_definition != expected_machine_definition: From 7c90b5dd306629d3a3e99f38cfd9dc0a2760643f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 13:56:37 +0200 Subject: [PATCH 292/994] Use shortcut to get current quality changes groups Contributes to issue CURA-6600. --- .../Models/CustomQualityProfilesDropDownMenuModel.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index 11ea391aaa..3ade02120d 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -19,11 +19,7 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): Logger.log("d", "No active GlobalStack, set %s as empty.", self.__class__.__name__) return - variant_names = [extruder.variant.getName() for extruder in active_global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in active_global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in active_global_stack.extruders.values()] - machine_node = ContainerTree.getInstance().machines[active_global_stack.definition.getId()] - quality_changes_list = machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) + quality_changes_list = ContainerTree.getInstance().getCurrentQualityChangesGroups() item_list = [] for quality_changes_group in sorted(quality_changes_list, key = lambda qgc: qgc.name.lower()): From 619adcb5b3e15ff176d7fa3222c48d1bf868a866 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 14:07:49 +0200 Subject: [PATCH 293/994] Fix handling quality_changes_group by metadata We only need to access the metadata so this is fine. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 6adcd8cb3a..3386c4d396 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1121,11 +1121,9 @@ class MachineManager(QObject): self.activeQualityChangesGroupChanged.emit() def _fixQualityChangesGroupToNotSupported(self, quality_changes_group: "QualityChangesGroup") -> None: - nodes = [quality_changes_group.node_for_global] + list(quality_changes_group.nodes_for_extruders.values()) - containers = [n.container for n in nodes if n is not None] - for container in containers: - if container: - container.setMetaDataEntry("quality_type", "not_supported") + metadatas = [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()) + for metadata in metadatas: + metadata["quality_type"] = "not_supported" # This actually changes the metadata of the container since they are stored by reference! quality_changes_group.quality_type = "not_supported" quality_changes_group.intent_category = "default" From 35907e52285c9f46e3c030a516c1e7ccb86d3d7e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 14:17:17 +0200 Subject: [PATCH 294/994] Use Pythonic way of creating list of N elements Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index e7930b6a1f..3b35a3db02 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -62,7 +62,7 @@ class MachineNode(ContainerNode): Logger.log("e", "The number of extruders in the list of variants (" + str(len(variant_names)) + ") is not equal to the number of extruders in the list of materials (" + str(len(material_bases)) + ") or the list of enabled extruders (" + str(len(extruder_enabled)) + ").") return {} # For each extruder, find which quality profiles are available. Later we'll intersect the quality types. - qualities_per_type_per_extruder = [{} for _ in range(len(variant_names))] # type: List[Dict[str, QualityNode]] + qualities_per_type_per_extruder = [{}] * len(variant_names) # type: List[Dict[str, QualityNode]] for extruder_nr, variant_name in enumerate(variant_names): if not extruder_enabled[extruder_nr]: continue # No qualities are available in this extruder. It'll get skipped when calculating the available quality types. From f89f47f8d53b02115fd706b53fbca6dd07b4ff84 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 14:31:07 +0200 Subject: [PATCH 295/994] Get quality definition from ContainerTree rather than QualityManager Contributes to issue CURA-6600. --- plugins/3MFReader/ThreeMFReader.py | 4 ++-- plugins/3MFReader/ThreeMFWorkspaceReader.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index b81d0858a4..20eb9b29dc 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -19,12 +19,12 @@ from UM.Scene.SceneNode import SceneNode #For typing. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from cura.CuraApplication import CuraApplication +from cura.Machines.ContainerTree import ContainerTree from cura.Settings.ExtruderManager import ExtruderManager from cura.Scene.CuraSceneNode import CuraSceneNode from cura.Scene.BuildPlateDecorator import BuildPlateDecorator from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator from cura.Scene.ZOffsetDecorator import ZOffsetDecorator -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch try: @@ -131,7 +131,7 @@ class ThreeMFReader(MeshReader): um_node.callDecoration("setActiveExtruder", default_stack.getId()) # Get the definition & set it - definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack.definition) + definition_id = ContainerTree.getInstance().machines[global_container_stack.definition.getId()].quality_definition um_node.callDecoration("getStack").getTop().setDefinition(definition_id) setting_container = um_node.callDecoration("getStack").getTop() diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 873d5e8fae..d7cc2f0b70 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -747,8 +747,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._machine_info.quality_changes_info.name) # Get the correct extruder definition IDs for quality changes - from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch - machine_definition_id_for_quality = getMachineDefinitionIDForQualitySearch(global_stack.definition) + machine_definition_id_for_quality = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition machine_definition_for_quality = self._container_registry.findDefinitionContainers(id = machine_definition_id_for_quality)[0] quality_changes_info = self._machine_info.quality_changes_info From b9370f864e7d06c4e53d6f756bf75f5b9a3b163b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 14:34:00 +0200 Subject: [PATCH 296/994] Get quality definition from container tree Contributes to issue CURA-6600. --- cura/Settings/CuraContainerRegistry.py | 1 - plugins/GCodeWriter/GCodeWriter.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index c551431882..80698e982a 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -29,7 +29,6 @@ from . import GlobalStack import cura.CuraApplication from cura.Settings.cura_empty_instance_containers import empty_quality_container from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch from cura.ReaderWriters.ProfileReader import NoProfileException, ProfileReader from UM.i18n import i18nCatalog diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 3e5bf59e73..2c6603cb3f 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -9,8 +9,7 @@ from UM.Mesh.MeshWriter import MeshWriter from UM.Logger import Logger from UM.Application import Application from UM.Settings.InstanceContainer import InstanceContainer - -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch +from cura.Machines.ContainerTree import ContainerTree from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -139,7 +138,7 @@ class GCodeWriter(MeshWriter): flat_global_container.setMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal")) # Get the machine definition ID for quality profiles - machine_definition_id_for_quality = getMachineDefinitionIDForQualitySearch(stack.definition) + machine_definition_id_for_quality = ContainerTree.getInstance().machines[stack.definition.getId()].quality_definition flat_global_container.setMetaDataEntry("definition", machine_definition_id_for_quality) serialized = flat_global_container.serialize() From ba608c5987c1ac574b0c867f1d4a3d8c3f0e75f4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 14:57:02 +0200 Subject: [PATCH 297/994] Use container tree to reset quality after deleting packages Contributes to issue CURA-6600. --- plugins/GCodeWriter/GCodeWriter.py | 2 +- plugins/Toolbox/src/Toolbox.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 2c6603cb3f..9f9d6ebb79 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import re # For escaping characters in the settings. diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 4dabba87a0..5f73d563c7 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Toolbox is released under the terms of the LGPLv3 or higher. import json @@ -19,6 +19,7 @@ from UM.Version import Version from cura import ApplicationMetadata from cura import UltimakerCloudAuthentication from cura.CuraApplication import CuraApplication +from cura.Machines.ContainerTree import ContainerTree from .AuthorsModel import AuthorsModel from .PackagesModel import PackagesModel @@ -360,14 +361,19 @@ class Toolbox(QObject, Extension): def resetMaterialsQualitiesAndUninstall(self) -> None: application = CuraApplication.getInstance() material_manager = application.getMaterialManager() - quality_manager = application.getQualityManager() machine_manager = application.getMachineManager() + container_tree = ContainerTree.getInstance() for global_stack, extruder_nr, container_id in self._package_used_materials: default_material_node = material_manager.getDefaultMaterial(global_stack, extruder_nr, global_stack.extruders[extruder_nr].variant.getName()) machine_manager.setMaterial(extruder_nr, default_material_node, global_stack = global_stack) for global_stack, extruder_nr, container_id in self._package_used_qualities: - default_quality_group = quality_manager.getDefaultQualityType(global_stack) + variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + definition_id = global_stack.definition.getId() + machine_node = container_tree.machines[definition_id] + default_quality_group = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled)[machine_node.preferred_quality_type] machine_manager.setQualityGroup(default_quality_group, global_stack = global_stack) if self._package_id_to_uninstall is not None: From b3fd310d37ffe02341f27bbe3c4701eade9e9365 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 15:21:33 +0200 Subject: [PATCH 298/994] Move removeQualityChangesGroup to QualityManagementModel This is an operation specific to the quality management page, so it should be located there. Contributes to issue CURA-6600. --- .../Machines/Models/QualityManagementModel.py | 29 ++++++++++++++++++- cura/Machines/QualityManager.py | 15 +++++----- resources/qml/Preferences/ProfilesPage.qml | 2 +- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 792159b31d..eaaf1eb058 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -1,12 +1,18 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import Qt, pyqtSlot +from typing import TYPE_CHECKING +from PyQt5.QtCore import pyqtSlot, QObject, Qt from UM.Logger import Logger from UM.Qt.ListModel import ListModel + import cura.CuraApplication # Imported this way to prevent circular imports. from cura.Machines.ContainerTree import ContainerTree +from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container + +if TYPE_CHECKING: + from cura.Machines.QualityChangesGroup import QualityChangesGroup # # This the QML model for the quality management page. @@ -34,6 +40,27 @@ class QualityManagementModel(ListModel): self._update() + ## Deletes a custom profile. It will be gone forever. + # \param quality_changes_group The quality changes group representing the + # profile to delete. + @pyqtSlot(QObject) + def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: + Logger.log("i", "Removing quality changes group {group_name}".format(group_name = quality_changes_group.name)) + removed_quality_changes_ids = set() + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + for metadata in [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()): + container_id = metadata["id"] + container_registry.removeContainer(container_id) + removed_quality_changes_ids.add(container_id) + + # Reset all machines that have activated this custom profile. + for global_stack in container_registry.findContainerStacks(type = "machine"): + if global_stack.qualityChanges.getId() in removed_quality_changes_ids: + global_stack.qualityChanges = empty_quality_changes_container + for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): + if extruder_stack.qualityChanges.getId() in removed_quality_changes_ids: + extruder_stack.qualityChanges = empty_quality_changes_container + def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 75c8e89e11..94dfdd78e9 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -146,18 +146,19 @@ class QualityManager(QObject): # @pyqtSlot(QObject) def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: - Logger.log("i", "Removing quality changes group [%s]", quality_changes_group.name) + Logger.log("i", "Removing quality changes group {group_name}".format(group_name = quality_changes_group.name)) removed_quality_changes_ids = set() - for node in quality_changes_group.getAllNodes(): - container_id = node.container_id - self._container_registry.removeContainer(container_id) + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + for metadata in [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()): + container_id = metadata["id"] + container_registry.removeContainer(container_id) removed_quality_changes_ids.add(container_id) - # Reset all machines that have activated this quality changes to empty. - for global_stack in self._container_registry.findContainerStacks(type = "machine"): + # Reset all machines that have activated this custom profile. + for global_stack in container_registry.findContainerStacks(type = "machine"): if global_stack.qualityChanges.getId() in removed_quality_changes_ids: global_stack.qualityChanges = self._empty_quality_changes_container - for extruder_stack in self._container_registry.findContainerStacks(type = "extruder_train"): + for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): if extruder_stack.qualityChanges.getId() in removed_quality_changes_ids: extruder_stack.qualityChanges = self._empty_quality_changes_container diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index da41a0f23c..6907795e1a 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -254,7 +254,7 @@ Item onYes: { - base.qualityManager.removeQualityChangesGroup(base.currentItem.quality_changes_group); + base.qualityManagementModel.removeQualityChangesGroup(base.currentItem.quality_changes_group); // reset current item to the first if available qualityListView.currentIndex = -1; // Reset selection. } From be49956de95ab0267ced5d29f73138cdeed931f6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 15:29:03 +0200 Subject: [PATCH 299/994] Refer to quality management model to remove quality changes This function is deprecated now. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 94dfdd78e9..b95c65d5b5 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -141,26 +141,12 @@ class QualityManager(QObject): # Methods for GUI # - # - # Remove the given quality changes group. - # + ## Deletes a custom profile. It will be gone forever. + # \param quality_changes_group The quality changes group representing the + # profile to delete. @pyqtSlot(QObject) def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: - Logger.log("i", "Removing quality changes group {group_name}".format(group_name = quality_changes_group.name)) - removed_quality_changes_ids = set() - container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - for metadata in [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()): - container_id = metadata["id"] - container_registry.removeContainer(container_id) - removed_quality_changes_ids.add(container_id) - - # Reset all machines that have activated this custom profile. - for global_stack in container_registry.findContainerStacks(type = "machine"): - if global_stack.qualityChanges.getId() in removed_quality_changes_ids: - global_stack.qualityChanges = self._empty_quality_changes_container - for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): - if extruder_stack.qualityChanges.getId() in removed_quality_changes_ids: - extruder_stack.qualityChanges = self._empty_quality_changes_container + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group) # # Rename a set of quality changes containers. Returns the new name. From 5fadc7019dea1df7cb03b772b346fcea2f57e971 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 16:31:50 +0200 Subject: [PATCH 300/994] Move renameQualityChangesGroup to QualityManagementModel Contributes to issue CURA-6600. --- .../Machines/Models/QualityManagementModel.py | 29 +++++++++++++++++++ cura/Machines/QualityManager.py | 28 +++++------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index eaaf1eb058..4807471615 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -61,6 +61,35 @@ class QualityManagementModel(ListModel): if extruder_stack.qualityChanges.getId() in removed_quality_changes_ids: extruder_stack.qualityChanges = empty_quality_changes_container + ## Rename a custom profile. + # + # Because the names must be unique, the new name may not actually become + # the name that was given. The actual name is returned by this function. + # \param quality_changes_group The custom profile that must be renamed. + # \param new_name The desired name for the profile. + # \return The actual new name of the profile, after making the name + # unique. + @pyqtSlot(QObject, str, result = str) + def renameQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", new_name: str) -> str: + Logger.log("i", "Renaming QualityChangesGroup {old_name} to {new_name}.".format(old_name = quality_changes_group.name, new_name = new_name)) + if new_name == quality_changes_group.name: + Logger.log("i", "QualityChangesGroup name {name} unchanged.".format(name = quality_changes_group.name)) + return new_name + + application = cura.CuraApplication.CuraApplication.getInstance() + new_name = application.getContainerRegistry().uniqueName(new_name) + for node in quality_changes_group.getAllNodes(): + container = node.container + if container: + container.setName(new_name) + + quality_changes_group.name = new_name + + application.getMachineManager().activeQualityChanged.emit() + application.getMachineManager().activeQualityGroupChanged.emit() + + return new_name + def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index b95c65d5b5..804f47ad76 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -148,29 +148,17 @@ class QualityManager(QObject): def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group) + ## Rename a custom profile. # - # Rename a set of quality changes containers. Returns the new name. - # + # Because the names must be unique, the new name may not actually become + # the name that was given. The actual name is returned by this function. + # \param quality_changes_group The custom profile that must be renamed. + # \param new_name The desired name for the profile. + # \return The actual new name of the profile, after making the name + # unique. @pyqtSlot(QObject, str, result = str) def renameQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", new_name: str) -> str: - Logger.log("i", "Renaming QualityChangesGroup[%s] to [%s]", quality_changes_group.name, new_name) - if new_name == quality_changes_group.name: - Logger.log("i", "QualityChangesGroup name [%s] unchanged.", quality_changes_group.name) - return new_name - - new_name = self._container_registry.uniqueName(new_name) - for node in quality_changes_group.getAllNodes(): - container = node.container - if container: - container.setName(new_name) - - quality_changes_group.name = new_name - - application = cura.CuraApplication.CuraApplication.getInstance() - application.getMachineManager().activeQualityChanged.emit() - application.getMachineManager().activeQualityGroupChanged.emit() - - return new_name + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group) # # Duplicates the given quality. From 5d8fff69e422435f6e2b504a4b12cd081c57981a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 16:32:20 +0200 Subject: [PATCH 301/994] Fix referencing nodes for quality changes Contributes to issue CURA-6600. --- cura/Machines/Models/QualitySettingsModel.py | 30 +++++++++++++------- cura/Settings/MachineManager.py | 13 +++++++-- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index f0f7a55228..969fc95c13 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -3,7 +3,7 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt -from UM.Application import Application +import cura.CuraApplication from UM.Logger import Logger from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry @@ -35,15 +35,13 @@ class QualitySettingsModel(ListModel): self.addRoleName(self.CategoryRole, "category") self._container_registry = ContainerRegistry.getInstance() - self._application = Application.getInstance() - self._quality_manager = self._application.getQualityManager() + self._application = cura.CuraApplication.CuraApplication.getInstance() + self._application.getMachineManager().activeStackChanged.connect(self._update) self._selected_position = self.GLOBAL_STACK_POSITION #Must be either GLOBAL_STACK_POSITION or an extruder position (0, 1, etc.) self._selected_quality_item = None # The selected quality in the quality management page self._i18n_catalog = None - self._quality_manager.qualitiesUpdated.connect(self._update) - self._update() selectedPositionChanged = pyqtSignal() @@ -99,15 +97,25 @@ class QualitySettingsModel(ListModel): # Here, if the user has selected a quality changes, then "quality_changes_group" will not be None, and we fetch # the settings in that quality_changes_group. if quality_changes_group is not None: + container_registry = ContainerRegistry.getInstance() + global_containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"]) + global_container = None if len(global_containers) == 0 else global_containers[0] + extruders_containers = {pos: container_registry.findContainers(id = quality_changes_group.metadata_per_extruder[pos]["id"]) for pos in quality_changes_group.metadata_per_extruder} + extruders_container = {pos: None if not containers else containers[0] for pos, containers in extruders_containers.items()} if self._selected_position == self.GLOBAL_STACK_POSITION: - quality_changes_node = quality_changes_group.node_for_global + quality_changes_metadata = global_container.getMetaData() else: - quality_changes_node = quality_changes_group.nodes_for_extruders.get(str(self._selected_position)) - if quality_changes_node is not None and quality_changes_node.container is not None: # it can be None if number of extruders are changed during runtime - quality_containers.insert(0, quality_changes_node.container) - settings_keys.update(quality_changes_group.getAllKeys()) + quality_changes_metadata = extruders_container.get(str(self._selected_position)) + if quality_changes_metadata is not None: # It can be None if number of extruders are changed during runtime. + container = container_registry.findContainers(id = quality_changes_metadata["id"]) + if container: + quality_containers.insert(0, container[0]) - # We iterate over all definitions instead of settings in a quality/qualtiy_changes group is because in the GUI, + settings_keys.update(global_container.getAllKeys()) + for container in extruders_container.values(): + settings_keys.update(container.getAllKeys()) + + # We iterate over all definitions instead of settings in a quality/quality_changes group is because in the GUI, # the settings are grouped together by categories, and we had to go over all the definitions to figure out # which setting belongs in which category. current_category = "" diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3386c4d396..dbd9cf2479 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1139,8 +1139,13 @@ class MachineManager(QObject): if quality_group is None: self._fixQualityChangesGroupToNotSupported(quality_changes_group) + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container # type: Optional[InstanceContainer] + if quality_changes_group.metadata_for_global: + global_containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"]) + if global_containers: + quality_changes_container = global_containers[0] if quality_changes_group.node_for_global and quality_changes_group.node_for_global.container: quality_changes_container = cast(InstanceContainer, quality_changes_group.node_for_global.container) if quality_group is not None and quality_group.node_for_global and quality_group.node_for_global.container: @@ -1150,15 +1155,17 @@ class MachineManager(QObject): self._global_container_stack.qualityChanges = quality_changes_container for position, extruder in self._global_container_stack.extruders.items(): - quality_changes_node = quality_changes_group.nodes_for_extruders.get(position) quality_node = None if quality_group is not None: quality_node = quality_group.nodes_for_extruders.get(position) quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container - if quality_changes_node and quality_changes_node.container: - quality_changes_container = cast(InstanceContainer, quality_changes_node.container) + quality_changes_metadata = quality_changes_group.metadata_for_extruders.get(position) + if quality_changes_metadata: + containers = container_registry.findContainers(id = quality_changes_metadata["id"]) + if containers: + quality_changes_container = cast(InstanceContainer, containers[0]) if quality_node and quality_node.container: quality_container = quality_node.container From 2647b7e994938e8a91879e3d32687332a82f5c69 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 16:44:10 +0200 Subject: [PATCH 302/994] Fix latent querying for node_for_global on quality changes There are no quality changes nodes any more so this all has to happen through metadata. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index dbd9cf2479..c1f3ea6cb5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1146,8 +1146,10 @@ class MachineManager(QObject): global_containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"]) if global_containers: quality_changes_container = global_containers[0] - if quality_changes_group.node_for_global and quality_changes_group.node_for_global.container: - quality_changes_container = cast(InstanceContainer, quality_changes_group.node_for_global.container) + if quality_changes_group.metadata_for_global: + containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"]) + if containers: + quality_changes_container = cast(InstanceContainer, containers[0]) if quality_group is not None and quality_group.node_for_global and quality_group.node_for_global.container: quality_container = quality_group.node_for_global.container From a7e5830762f9e8abd06b01b915088b7b4184ebc7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 16:50:14 +0200 Subject: [PATCH 303/994] Fix case if containers are None This happens when the number of containers was resized. Contributes to issue CURA-6600. --- cura/Machines/Models/QualitySettingsModel.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 969fc95c13..6835ffb68f 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -102,7 +102,7 @@ class QualitySettingsModel(ListModel): global_container = None if len(global_containers) == 0 else global_containers[0] extruders_containers = {pos: container_registry.findContainers(id = quality_changes_group.metadata_per_extruder[pos]["id"]) for pos in quality_changes_group.metadata_per_extruder} extruders_container = {pos: None if not containers else containers[0] for pos, containers in extruders_containers.items()} - if self._selected_position == self.GLOBAL_STACK_POSITION: + if self._selected_position == self.GLOBAL_STACK_POSITION and global_container: quality_changes_metadata = global_container.getMetaData() else: quality_changes_metadata = extruders_container.get(str(self._selected_position)) @@ -111,9 +111,11 @@ class QualitySettingsModel(ListModel): if container: quality_containers.insert(0, container[0]) - settings_keys.update(global_container.getAllKeys()) + if global_container: + settings_keys.update(global_container.getAllKeys()) for container in extruders_container.values(): - settings_keys.update(container.getAllKeys()) + if container: + settings_keys.update(container.getAllKeys()) # We iterate over all definitions instead of settings in a quality/quality_changes group is because in the GUI, # the settings are grouped together by categories, and we had to go over all the definitions to figure out From b046ff6683ab58fdd7f77e46c6a30675c3bac88a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Aug 2019 16:54:41 +0200 Subject: [PATCH 304/994] Fix updating quality management page profile list When a custom profile gets added, deleted or renamed we need to update our model. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 4807471615..fef7ded30c 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -12,6 +12,7 @@ from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container if TYPE_CHECKING: + from UM.Settings.Interfaces import ContainerInterface from cura.Machines.QualityChangesGroup import QualityChangesGroup # @@ -37,6 +38,9 @@ class QualityManagementModel(ListModel): self._extruder_manager = application.getExtruderManager() self._machine_manager.globalContainerChanged.connect(self._update) + self._container_registry.containerAdded.connect(self._qualityChangesListChanged) + self._container_registry.containerRemoved.connect(self._qualityChangesListChanged) + self._container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) self._update() @@ -90,6 +94,14 @@ class QualityManagementModel(ListModel): return new_name + ## Triggered when any container changed. + # + # This filters the updates to the container manager: When it applies to + # the list of quality changes, we need to update our list. + def _qualityChangesListChanged(self, container: "ContainerInterface") -> None: + if container.getMetaDataEntry("type") == "quality_changes": + self._update() + def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) From 9614cef13557dd9f7c7cf76b1f1fcf032a4768b1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 29 Aug 2019 09:02:18 +0200 Subject: [PATCH 305/994] Move duplicateQualityChanges to QualityManagementModel This is specific to the quality management page, so moving it here prevents QualityManager from becoming a big ball of spaghetti again. Contributes to issue CURA-6600. --- .../Machines/Models/QualityManagementModel.py | 73 +++++++++++++++++-- cura/Machines/QualityManager.py | 36 +++------ 2 files changed, 77 insertions(+), 32 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index fef7ded30c..dcd7a770ee 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -1,11 +1,12 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import Any, Dict, Optional, TYPE_CHECKING from PyQt5.QtCore import pyqtSlot, QObject, Qt from UM.Logger import Logger from UM.Qt.ListModel import ListModel +from UM.Settings.InstanceContainer import InstanceContainer # To create new profiles. import cura.CuraApplication # Imported this way to prevent circular imports. from cura.Machines.ContainerTree import ContainerTree @@ -14,6 +15,8 @@ from cura.Settings.cura_empty_instance_containers import empty_quality_changes_c if TYPE_CHECKING: from UM.Settings.Interfaces import ContainerInterface from cura.Machines.QualityChangesGroup import QualityChangesGroup + from cura.Settings.ExtruderStack import ExtruderStack + from cura.Settings.GlobalStack import GlobalStack # # This the QML model for the quality management page. @@ -33,14 +36,14 @@ class QualityManagementModel(ListModel): self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") application = cura.CuraApplication.CuraApplication.getInstance() - self._container_registry = application.getContainerRegistry() + container_registry = application.getContainerRegistry() self._machine_manager = application.getMachineManager() self._extruder_manager = application.getExtruderManager() self._machine_manager.globalContainerChanged.connect(self._update) - self._container_registry.containerAdded.connect(self._qualityChangesListChanged) - self._container_registry.containerRemoved.connect(self._qualityChangesListChanged) - self._container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) + container_registry.containerAdded.connect(self._qualityChangesListChanged) + container_registry.containerRemoved.connect(self._qualityChangesListChanged) + container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) self._update() @@ -94,6 +97,66 @@ class QualityManagementModel(ListModel): return new_name + ## Duplicates a given quality profile OR quality changes profile. + # \param new_name The desired name of the new profile. This will be made + # unique, so it might end up with a different name. + # \param quality_model_item The item of this model to duplicate, as + # dictionary. See the descriptions of the roles of this list model. + @pyqtSlot(str, "QVariantMap") + def duplicateQualityChanges(self, new_name: str, quality_model_item: Dict[str, Any]) -> None: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack: + Logger.log("i", "No active global stack, cannot duplicate quality (changes) profile.") + return + + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + new_name = container_registry.uniqueName(new_name) + + quality_group = quality_model_item["quality_group"] + quality_changes_group = quality_model_item["quality_changes_group"] + if quality_changes_group is None: + # Create global quality changes only. + new_quality_changes = self._createQualityChanges(quality_group.quality_type, new_name, global_stack, extruder_stack = None) + container_registry.addContainer(new_quality_changes) + else: + for metadata in [quality_changes_group.metadata_for_global] + quality_changes_group.metadata_per_extruder.values(): + containers = container_registry.findContainers(id = metadata["id"]) + if not containers: + continue + container = containers[0] + new_id = container_registry.uniqueName(container.getId()) + container_registry.addContainer(container.duplicate(new_id, new_name)) + + ## Create a quality changes container with the given set-up. + # \param quality_type The quality type of the new container. + # \param new_name The name of the container. This name must be unique. + # \param machine The global stack to create the profile for. + # \param extruder_stack The extruder stack to create the profile for. If + # not provided, only a global container will be created. + def _createQualityChanges(self, quality_type: str, new_name: str, machine: "GlobalStack", extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + base_id = machine.definition.getId() if extruder_stack is None else extruder_stack.getId() + new_id = base_id + "_" + new_name + new_id = new_id.lower().replace(" ", "_") + new_id = container_registry.uniqueName(new_id) + + # Create a new quality_changes container for the quality. + quality_changes = InstanceContainer(new_id) + quality_changes.setName(new_name) + quality_changes.setMetaDataEntry("type", "quality_changes") + quality_changes.setMetaDataEntry("quality_type", quality_type) + + # If we are creating a container for an extruder, ensure we add that to the container. + if extruder_stack is not None: + quality_changes.setMetaDataEntry("position", extruder_stack.getMetaDataEntry("position")) + + # If the machine specifies qualities should be filtered, ensure we match the current criteria. + machine_definition_id = ContainerTree.getInstance().machines[machine.definition.getId()].quality_definition + quality_changes.setDefinition(machine_definition_id) + + quality_changes.setMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.getInstance().SettingVersion) + return quality_changes + ## Triggered when any container changed. # # This filters the updates to the container manager: When it applies to diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 804f47ad76..7d0ad1e24e 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING, Optional, Dict, List +from typing import Any, Dict, List, Optional, TYPE_CHECKING from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot @@ -158,34 +158,16 @@ class QualityManager(QObject): # unique. @pyqtSlot(QObject, str, result = str) def renameQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", new_name: str) -> str: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group) + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group, new_name) - # - # Duplicates the given quality. - # + ## Duplicates a given quality profile OR quality changes profile. + # \param new_name The desired name of the new profile. This will be made + # unique, so it might end up with a different name. + # \param quality_model_item The item of this model to duplicate, as + # dictionary. See the descriptions of the roles of this list model. @pyqtSlot(str, "QVariantMap") - def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item) -> None: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if not global_stack: - Logger.log("i", "No active global stack, cannot duplicate quality changes.") - return - - quality_group = quality_model_item["quality_group"] - quality_changes_group = quality_model_item["quality_changes_group"] - if quality_changes_group is None: - # create global quality changes only - new_name = self._container_registry.uniqueName(quality_changes_name) - new_quality_changes = self._createQualityChanges(quality_group.quality_type, new_name, - global_stack, None) - self._container_registry.addContainer(new_quality_changes) - else: - new_name = self._container_registry.uniqueName(quality_changes_name) - for node in quality_changes_group.getAllNodes(): - container = node.container - if not container: - continue - new_id = self._container_registry.uniqueName(container.getId()) - self._container_registry.addContainer(container.duplicate(new_id, new_name)) + def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item: Dict[str, Any]) -> None: + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().duplicateQualityChanges(quality_changes_name, quality_model_item) ## Create quality changes containers from the user containers in the active stacks. # From 2676c7fa2ffc4ba5cd4736ea88ce3992afe945af Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 29 Aug 2019 09:03:04 +0200 Subject: [PATCH 306/994] Fix getting container metadata when switching to quality changes profile Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index c1f3ea6cb5..89838e6def 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1163,7 +1163,7 @@ class MachineManager(QObject): quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container - quality_changes_metadata = quality_changes_group.metadata_for_extruders.get(position) + quality_changes_metadata = quality_changes_group.metadata_per_extruder.get(position) if quality_changes_metadata: containers = container_registry.findContainers(id = quality_changes_metadata["id"]) if containers: From 11c23b4fe9108fd5739b56e70e76091c47f9644b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 25 Jul 2019 16:54:47 +0200 Subject: [PATCH 307/994] Add first draft of the radiocheckbar CURA-6598 --- resources/qml/RadioCheckbar.qml | 127 ++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 resources/qml/RadioCheckbar.qml diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml new file mode 100644 index 0000000000..2d863f7a66 --- /dev/null +++ b/resources/qml/RadioCheckbar.qml @@ -0,0 +1,127 @@ +import QtQuick 2.0 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 +Item +{ + id: base + property ButtonGroup buttonGroup: null + + property color activeColor: "#3282ff" + property color inactiveColor: "#cccccc" + property color defaultItemColor: "#0a0850" + property int checkboxSize: 14 + property int inactiveMarkerSize: 4 + property int barSize: 2 + + implicitWidth: 200 + implicitHeight: buttonBar.height + + property var model: null + + // The horizontal inactive bar that sits behind the buttons + Rectangle + { + id: inactiveLine + color: inactiveColor + anchors.verticalCenter: buttonBar.verticalCenter + height: barSize + width: buttonBar.width + } + + RowLayout + { + id: buttonBar + height: childrenRect.height + width: parent.width + spacing: 0 + Repeater + { + id: repeater + model: base.model + + Item + { + Layout.fillWidth: true + // The last item of the repeater needs to be shorter, as we don't need another part to fit + // the horizontal bar. The others should essentially not be limited. + Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 + height: activeComponent.height + + property bool isEnabled: model.enabled + // The horizontal bar between the checkable options. + // Note that the horizontal bar points towards the previous item. + Rectangle + { + property Item previousItem: repeater.itemAt(index - 1) + + height: barSize + width: parent.width - activeComponent.width + color: defaultItemColor + + anchors + { + right: activeComponent.left + verticalCenter: activeComponent.verticalCenter + } + visible: previousItem !== null && previousItem.isEnabled && isEnabled + } + Loader + { + id: activeComponent + sourceComponent: isEnabled? checkboxComponent : disabledComponent + } + } + } + } + + Component + { + id: disabledComponent + Item + { + height: checkboxSize + width: inactiveMarkerSize + Rectangle + { + anchors.centerIn: parent + height: parent.width + width: parent.width + radius: width / 2 + color: inactiveColor + } + } + } + + Component + { + id: checkboxComponent + CheckBox + { + id: checkbox + ButtonGroup.group: buttonGroup + width: checkboxSize + height: checkboxSize + indicator: Rectangle + { + height: checkbox.height + width: checkbox.width + radius: width / 2 + + anchors.centerIn: checkbox + border.color: defaultItemColor + + Rectangle + { + anchors + { + margins: 3 + fill: parent + } + radius: width / 2 + color: activeColor + visible: checkbox.checked + } + } + } + } +} From abc6e5950b6b4ca0dab413c30300c5a6091254be Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 25 Jul 2019 17:02:34 +0200 Subject: [PATCH 308/994] Fix alignment of inactiveMarker CURA-6598 --- resources/qml/RadioCheckbar.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 2d863f7a66..645b24e560 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -69,6 +69,8 @@ Item { id: activeComponent sourceComponent: isEnabled? checkboxComponent : disabledComponent + // Ensure the inactive markers that are not the first / last one align with the center of the checkboxes + x: isEnabled && index !== 0 && index + 1 !== repeater.count ? -(checkboxSize - inactiveMarkerSize) / 2: 0 } } } From cc4dc6a27c53cb780bc152c70074b4c7f5543d53 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 25 Jul 2019 17:05:31 +0200 Subject: [PATCH 309/994] Fix overlap if first option is radioButton CURA-6598 --- resources/qml/RadioCheckbar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 645b24e560..5210fed9e6 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -70,7 +70,7 @@ Item id: activeComponent sourceComponent: isEnabled? checkboxComponent : disabledComponent // Ensure the inactive markers that are not the first / last one align with the center of the checkboxes - x: isEnabled && index !== 0 && index + 1 !== repeater.count ? -(checkboxSize - inactiveMarkerSize) / 2: 0 + x: !isEnabled && index !== 0 && index + 1 !== repeater.count ? (checkboxSize - inactiveMarkerSize) / 2: 0 } } } From e47514d6dd8ffa978b7547e41160d559a986fd13 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 25 Jul 2019 17:37:35 +0200 Subject: [PATCH 310/994] Fix horizontal bar not coloring correct if last item is checkbox CURA-6598 --- resources/qml/RadioCheckbar.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 5210fed9e6..6a07d49b99 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -31,6 +31,7 @@ Item RowLayout { id: buttonBar + anchors.centerIn: parent height: childrenRect.height width: parent.width spacing: 0 @@ -46,7 +47,6 @@ Item // the horizontal bar. The others should essentially not be limited. Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 height: activeComponent.height - property bool isEnabled: model.enabled // The horizontal bar between the checkable options. // Note that the horizontal bar points towards the previous item. @@ -55,7 +55,7 @@ Item property Item previousItem: repeater.itemAt(index - 1) height: barSize - width: parent.width - activeComponent.width + width: buttonBar.width / (repeater.count - 1) - activeComponent.width - 2 color: defaultItemColor anchors @@ -63,7 +63,7 @@ Item right: activeComponent.left verticalCenter: activeComponent.verticalCenter } - visible: previousItem !== null && previousItem.isEnabled && isEnabled + visible: previousItem !== null && previousItem.isEnabled && isEnabled } Loader { From a66c074e972c51a96a378f777bb3e2e583f230e8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 26 Jul 2019 10:43:47 +0200 Subject: [PATCH 311/994] Simplify the alignment code CURA-6598 --- resources/qml/RadioCheckbar.qml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 6a07d49b99..a50cb4a9fe 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -25,7 +25,13 @@ Item color: inactiveColor anchors.verticalCenter: buttonBar.verticalCenter height: barSize - width: buttonBar.width + anchors + { + left: buttonBar.left + right: buttonBar.right + leftMargin: (checkboxSize - inactiveMarkerSize) / 2 + rightMargin: (checkboxSize - inactiveMarkerSize) / 2 + } } RowLayout @@ -69,8 +75,6 @@ Item { id: activeComponent sourceComponent: isEnabled? checkboxComponent : disabledComponent - // Ensure the inactive markers that are not the first / last one align with the center of the checkboxes - x: !isEnabled && index !== 0 && index + 1 !== repeater.count ? (checkboxSize - inactiveMarkerSize) / 2: 0 } } } @@ -82,12 +86,12 @@ Item Item { height: checkboxSize - width: inactiveMarkerSize + width: checkboxSize Rectangle { anchors.centerIn: parent - height: parent.width - width: parent.width + height: inactiveMarkerSize + width: inactiveMarkerSize radius: width / 2 color: inactiveColor } From a275e3de2b964434b700bf632d665180fab3600a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 26 Jul 2019 11:39:03 +0200 Subject: [PATCH 312/994] Add LabelBar component CURA-6598 --- resources/qml/LabelBar.qml | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 resources/qml/LabelBar.qml diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml new file mode 100644 index 0000000000..f8f77e2017 --- /dev/null +++ b/resources/qml/LabelBar.qml @@ -0,0 +1,50 @@ +import QtQuick 2.0 +import QtQuick.Controls 2.1 +import QtQuick.Layouts 1.3 + +// The labelBar shows a set of labels that are evenly spaced from oneother. +// The first item is aligned to the left, the last is aligned to the right. +// It's intended to be used together with RadioCheckBar. As such, it needs +// to know what the used itemSize is, so it can ensure the labels are aligned correctly. +Item +{ + id: base + property var model: null + property int itemSize: 14 + RowLayout + { + anchors.fill: parent + spacing: 0 + Repeater + { + id: repeater + model: base.model + + Item + { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.maximumWidth: index + 1 === repeater.count ? itemSize: 200000000 + + Label + { + id: label + text: model.text + + anchors + { + // Some magic to ensure that the items are aligned properly. + // We want the following: + // First item should be aligned to the left, no margin. + // Last item should be aligned to the right, no margin. + // The middle item(s) should be aligned to the center of the "item" it's showing (hence half the itemsize as offset). + // We want the center of the label to align with the center of the item, so we negatively offset by half the contentWidth + right: index + 1 === repeater.count ? parent.right: undefined + left: index + 1 === repeater.count || index === 0 ? undefined: parent.left + leftMargin: (0.5 * itemSize) - 0.5 * contentWidth + } + } + } + } + } +} From ae406e2480f2f0209b7a43d281232dd7f7555a59 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Jul 2019 16:01:23 +0200 Subject: [PATCH 313/994] Fix the RadioCheckbar to work in Cura --- resources/qml/RadioCheckbar.qml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index a50cb4a9fe..8c47efa05b 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -14,7 +14,7 @@ Item property int barSize: 2 implicitWidth: 200 - implicitHeight: buttonBar.height + implicitHeight: checkboxSize property var model: null @@ -23,8 +23,12 @@ Item { id: inactiveLine color: inactiveColor - anchors.verticalCenter: buttonBar.verticalCenter + height: barSize + + // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator + // but not when using the exact same QML in Cura. + y: 0.5 * checkboxSize anchors { left: buttonBar.left @@ -37,15 +41,16 @@ Item RowLayout { id: buttonBar - anchors.centerIn: parent - height: childrenRect.height + anchors.top: parent.top + height: checkboxSize width: parent.width spacing: 0 + Repeater { id: repeater model: base.model - + height: checkboxSize Item { Layout.fillWidth: true @@ -53,7 +58,7 @@ Item // the horizontal bar. The others should essentially not be limited. Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 height: activeComponent.height - property bool isEnabled: model.enabled + property bool isEnabled: model.available // The horizontal bar between the checkable options. // Note that the horizontal bar points towards the previous item. Rectangle @@ -67,7 +72,6 @@ Item anchors { right: activeComponent.left - verticalCenter: activeComponent.verticalCenter } visible: previousItem !== null && previousItem.isEnabled && isEnabled } @@ -75,6 +79,10 @@ Item { id: activeComponent sourceComponent: isEnabled? checkboxComponent : disabledComponent + width: checkboxSize + // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator + // but not when using the exact same QML in Cura. + y: -0.5 * checkboxSize } } } @@ -87,9 +95,13 @@ Item { height: checkboxSize width: checkboxSize + Rectangle { - anchors.centerIn: parent + // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator + // but not when using the exact same QML in Cura. + y: 0.5 * checkboxSize - 1 + anchors.horizontalCenter: parent.horizontalCenter height: inactiveMarkerSize width: inactiveMarkerSize radius: width / 2 @@ -109,11 +121,10 @@ Item height: checkboxSize indicator: Rectangle { - height: checkbox.height - width: checkbox.width + height: checkboxSize + width: checkboxSize radius: width / 2 - anchors.centerIn: checkbox border.color: defaultItemColor Rectangle From 3b93a1914a7f40b4fd17f8c1bbd90f7caf76e1ab Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Jul 2019 16:12:39 +0200 Subject: [PATCH 314/994] Ensure the Label bar uses the theme CURA-6598 --- resources/qml/LabelBar.qml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index f8f77e2017..ea29df0e06 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 - +import UM 1.2 as UM // The labelBar shows a set of labels that are evenly spaced from oneother. // The first item is aligned to the left, the last is aligned to the right. // It's intended to be used together with RadioCheckBar. As such, it needs @@ -10,10 +10,14 @@ Item { id: base property var model: null + property string modelKey: "" property int itemSize: 14 + height: childrenRect.height RowLayout { - anchors.fill: parent + anchors.left: parent.left + anchors.right: parent.right + height: childrenRect.height spacing: 0 Repeater { @@ -25,12 +29,14 @@ Item Layout.fillWidth: true Layout.fillHeight: true Layout.maximumWidth: index + 1 === repeater.count ? itemSize: 200000000 - + height: childrenRect.height Label { id: label - text: model.text - + text: model[modelKey] + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + height: contentHeight anchors { // Some magic to ensure that the items are aligned properly. From 6b90975391792773e01e1e11d3ff10607707e4e4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Jul 2019 16:53:42 +0200 Subject: [PATCH 315/994] Replace the old settingSlider with the RadioButtonbar CURA-6598 --- .../RecommendedQualityProfileSelector.qml | 379 ++---------------- resources/qml/RadioCheckbar.qml | 10 + 2 files changed, 33 insertions(+), 356 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 0486f5d2d7..343be60e73 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -3,6 +3,7 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 +import QtQuick.Controls 2.3 as Controls2 import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM @@ -33,133 +34,6 @@ Item } } - Component.onCompleted: qualityModel.update() - - Connections - { - target: Cura.QualityProfilesDropDownMenuModel - onItemsChanged: qualityModel.update() - } - - Connections { - target: base - onVisibleChanged: - { - // update needs to be called when the widgets are visible, otherwise the step width calculation - // will fail because the width of an invisible item is 0. - if (visible) - { - qualityModel.update(); - } - } - } - - ListModel - { - id: qualityModel - - property var totalTicks: 0 - property var availableTotalTicks: 0 - property var existingQualityProfile: 0 - - property var qualitySliderActiveIndex: 0 - property var qualitySliderStepWidth: 0 - property var qualitySliderAvailableMin: 0 - property var qualitySliderAvailableMax: 0 - property var qualitySliderMarginRight: 0 - - function update () - { - reset() - - var availableMin = -1 - var availableMax = -1 - - for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++) - { - var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i) - - // Add each quality item to the UI quality model - qualityModel.append(qualityItem) - - // Set selected value - if (Cura.MachineManager.activeQualityType == qualityItem.quality_type) - { - // set to -1 when switching to user created profile so all ticks are clickable - if (Cura.MachineManager.hasCustomQuality) - { - qualityModel.qualitySliderActiveIndex = -1 - } - else - { - qualityModel.qualitySliderActiveIndex = i - } - - qualityModel.existingQualityProfile = 1 - } - - // Set min available - if (qualityItem.available && availableMin == -1) - { - availableMin = i - } - - // Set max available - if (qualityItem.available) - { - availableMax = i - } - } - - // Set total available ticks for active slider part - if (availableMin != -1) - { - qualityModel.availableTotalTicks = availableMax - availableMin + 1 - } - - // Calculate slider values - calculateSliderStepWidth(qualityModel.totalTicks) - calculateSliderMargins(availableMin, availableMax, qualityModel.totalTicks) - - qualityModel.qualitySliderAvailableMin = availableMin - qualityModel.qualitySliderAvailableMax = availableMax - } - - function calculateSliderStepWidth (totalTicks) - { - // Do not use Math.round otherwise the tickmarks won't be aligned - qualityModel.qualitySliderStepWidth = totalTicks != 0 ? - ((settingsColumnWidth - UM.Theme.getSize("print_setup_slider_handle").width) / (totalTicks)) : 0 - } - - function calculateSliderMargins (availableMin, availableMax, totalTicks) - { - if (availableMin == -1 || (availableMin == 0 && availableMax == 0)) - { - // Do not use Math.round otherwise the tickmarks won't be aligned - qualityModel.qualitySliderMarginRight = settingsColumnWidth / 2 - } - else if (availableMin == availableMax) - { - // Do not use Math.round otherwise the tickmarks won't be aligned - qualityModel.qualitySliderMarginRight = (totalTicks - availableMin) * qualitySliderStepWidth - } - else - { - // Do not use Math.round otherwise the tickmarks won't be aligned - qualityModel.qualitySliderMarginRight = (totalTicks - availableMax) * qualitySliderStepWidth - } - } - - function reset () { - qualityModel.clear() - qualityModel.availableTotalTicks = 0 - qualityModel.existingQualityProfile = 0 - - // check, the ticks count cannot be less than zero - qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1) - } - } // Here are the elements that are shown in the left column Item @@ -210,246 +84,39 @@ Item } } - // Show titles for the each quality slider ticks Item { - anchors.left: speedSlider.left - anchors.top: speedSlider.bottom - height: childrenRect.height - - Repeater + anchors.left: titleRow.right + anchors.right: parent.right + Controls2.ButtonGroup { - model: qualityModel - - Label - { - anchors.verticalCenter: parent.verticalCenter - anchors.top: parent.top - // The height has to be set manually, otherwise it's not automatically calculated in the repeater - height: UM.Theme.getSize("default_margin").height - color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") - text: - { - var result = "" - if(Cura.MachineManager.activeMachine != null) - { - result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height - - if(result == undefined) - { - result = ""; - } - else - { - result = Number(Math.round(result + "e+2") + "e-2"); //Round to 2 decimals. Javascript makes this difficult... - if (result == undefined || result != result) //Parse failure. - { - result = ""; - } - } - } - return result - } - - x: - { - // Make sure the text aligns correctly with each tick - if (qualityModel.totalTicks == 0) - { - // If there is only one tick, align it centrally - return Math.round(((settingsColumnWidth) - width) / 2) - } - else if (index == 0) - { - return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index - } - else if (index == qualityModel.totalTicks) - { - return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index - width - } - else - { - return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2)) - } - } - font: UM.Theme.getFont("default") - } + id: activeProfileButtonGroup + exclusive: true + onClicked: Cura.MachineManager.activeQualityGroup = button.identifier } - } - - // Print speed slider - // Two sliders are created, one at the bottom with the unavailable qualities - // and the other at the top with the available quality profiles and so the handle to select them. - Item - { - id: speedSlider - height: childrenRect.height - - anchors + Cura.LabelBar { - left: titleRow.right - right: parent.right - verticalCenter: titleRow.verticalCenter + id: labelbar + anchors.left: parent.left + anchors.right: parent.right + model: Cura.QualityProfilesDropDownMenuModel + modelKey: "layer_height" } - - // Draw unavailable slider - Slider + Cura.RadioCheckbar { - id: unavailableSlider + anchors.left: parent.left + anchors.right: parent.right + anchors.top: labelbar.bottom + model: Cura.QualityProfilesDropDownMenuModel + buttonGroup: activeProfileButtonGroup + modelKey: "quality_group" - width: parent.width - height: qualitySlider.height // Same height as the slider that is on top - updateValueWhileDragging : false - tickmarksEnabled: true - - minimumValue: 0 - // maximumValue must be greater than minimumValue to be able to see the handle. While the value is strictly - // speaking not always correct, it seems to have the correct behavior (switching from 0 available to 1 available) - maximumValue: qualityModel.totalTicks - stepSize: 1 - - style: SliderStyle + function checkedFunction(modelItem) { - //Draw Unvailable line - groove: Item - { - Rectangle - { - height: UM.Theme.getSize("print_setup_slider_groove").height - width: control.width - UM.Theme.getSize("print_setup_slider_handle").width - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: UM.Theme.getColor("quality_slider_unavailable") - } - } - - handle: Item {} - - tickmarks: Repeater - { - id: qualityRepeater - model: qualityModel.totalTicks > 0 ? qualityModel : 0 - - Rectangle - { - color: Cura.QualityProfilesDropDownMenuModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") - implicitWidth: UM.Theme.getSize("print_setup_slider_tickmarks").width - implicitHeight: UM.Theme.getSize("print_setup_slider_tickmarks").height - anchors.verticalCenter: parent.verticalCenter - - // Do not use Math.round otherwise the tickmarks won't be aligned - x: ((UM.Theme.getSize("print_setup_slider_handle").width / 2) - (implicitWidth / 2) + (qualityModel.qualitySliderStepWidth * index)) - radius: Math.round(implicitWidth / 2) - } - } + return Cura.MachineManager.activeQualityType == modelItem.quality_type } - // Create a mouse area on top of the unavailable profiles to show a specific tooltip - MouseArea - { - anchors.fill: parent - hoverEnabled: true - enabled: !Cura.MachineManager.hasCustomQuality - onEntered: - { - var tooltipContent = catalog.i18nc("@tooltip", "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile.") - base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), tooltipContent) - } - onExited: base.hideTooltip() - } - } - - // Draw available slider - Slider - { - id: qualitySlider - - width: qualityModel.qualitySliderStepWidth * (qualityModel.availableTotalTicks - 1) + UM.Theme.getSize("print_setup_slider_handle").width - height: UM.Theme.getSize("print_setup_slider_handle").height // The handle is the widest element of the slider - enabled: qualityModel.totalTicks > 0 && !Cura.SimpleModeSettingsManager.isProfileCustomized - visible: qualityModel.availableTotalTicks > 0 - updateValueWhileDragging : false - - anchors - { - right: parent.right - rightMargin: qualityModel.qualitySliderMarginRight - } - - minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0 - // maximumValue must be greater than minimumValue to be able to see the handle. While the value is strictly - // speaking not always correct, it seems to have the correct behavior (switching from 0 available to 1 available) - maximumValue: qualityModel.qualitySliderAvailableMax >= 1 ? qualityModel.qualitySliderAvailableMax : 1 - stepSize: 1 - - value: qualityModel.qualitySliderActiveIndex - - style: SliderStyle - { - // Draw Available line - groove: Item - { - Rectangle - { - height: UM.Theme.getSize("print_setup_slider_groove").height - width: control.width - UM.Theme.getSize("print_setup_slider_handle").width - anchors.verticalCenter: parent.verticalCenter - - // Do not use Math.round otherwise the tickmarks won't be aligned - x: UM.Theme.getSize("print_setup_slider_handle").width / 2 - color: UM.Theme.getColor("quality_slider_available") - } - } - - handle: Rectangle - { - id: qualityhandleButton - color: UM.Theme.getColor("primary") - implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width - implicitHeight: implicitWidth - radius: Math.round(implicitWidth / 2) - visible: !Cura.SimpleModeSettingsManager.isProfileCustomized && !Cura.MachineManager.hasCustomQuality && qualityModel.existingQualityProfile - } - } - - onValueChanged: - { - // only change if an active machine is set and the slider is visible at all. - if (Cura.MachineManager.activeMachine != null && visible) - { - // prevent updating during view initializing. Trigger only if the value changed by user - if (qualitySlider.value != qualityModel.qualitySliderActiveIndex && qualityModel.qualitySliderActiveIndex != -1) - { - // start updating with short delay - qualitySliderChangeTimer.start() - } - } - } - - // This mouse area is only used to capture the onHover state and don't propagate it to the unavailable mouse area - MouseArea - { - anchors.fill: parent - hoverEnabled: true - acceptedButtons: Qt.NoButton - enabled: !Cura.MachineManager.hasCustomQuality - } - } - - // This mouse area will only take the mouse events and show a tooltip when the profile in use is - // a user created profile - MouseArea - { - anchors.fill: parent - hoverEnabled: true - visible: Cura.MachineManager.hasCustomQuality - - onEntered: - { - var tooltipContent = catalog.i18nc("@tooltip", "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab") - base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), tooltipContent) - } - onExited: base.hideTooltip() + isCheckedFunction: checkedFunction } } } \ No newline at end of file diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 8c47efa05b..3044fedb86 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 + Item { id: base @@ -12,12 +13,18 @@ Item property int checkboxSize: 14 property int inactiveMarkerSize: 4 property int barSize: 2 + property var isCheckedFunction // Function that accepts the modelItem and returns if the item should be active. implicitWidth: 200 implicitHeight: checkboxSize property var model: null + // What key of the model should be used to set the identifier of the checkbox. + // This is used to figure out what checkbox just got toggled. Set a buttonGroup and listen to it's clicked signal. + // You can use button.identifier to figure out which button was clicked. + property string modelKey: "name" + // The horizontal inactive bar that sits behind the buttons Rectangle { @@ -83,6 +90,7 @@ Item // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator // but not when using the exact same QML in Cura. y: -0.5 * checkboxSize + property var modelItem: model } } } @@ -119,6 +127,8 @@ Item ButtonGroup.group: buttonGroup width: checkboxSize height: checkboxSize + property var identifier: modelItem[base.modelKey] + checked: isCheckedFunction(modelItem) indicator: Rectangle { height: checkboxSize From 9e5082a42f5251e743028017b5dce015b50923c3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Jul 2019 17:00:02 +0200 Subject: [PATCH 316/994] Cleanup the qml a bit CURA-6598 --- .../RecommendedQualityProfileSelector.qml | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 343be60e73..0666853726 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -84,29 +84,44 @@ Item } } - Item + Column { - anchors.left: titleRow.right - anchors.right: parent.right + anchors + { + left: titleRow.right + right: parent.right + } + + spacing: UM.Theme.getSize("default_margin").height + Controls2.ButtonGroup { id: activeProfileButtonGroup exclusive: true onClicked: Cura.MachineManager.activeQualityGroup = button.identifier } + Cura.LabelBar { id: labelbar - anchors.left: parent.left - anchors.right: parent.right + anchors + { + left: parent.left + right: parent.right + } + model: Cura.QualityProfilesDropDownMenuModel modelKey: "layer_height" } + Cura.RadioCheckbar { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: labelbar.bottom + anchors + { + left: parent.left + right: parent.right + } + model: Cura.QualityProfilesDropDownMenuModel buttonGroup: activeProfileButtonGroup modelKey: "quality_group" From 8d53ee90b4e2741fd349d0a1ac57cb6418f638ba Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Jul 2019 17:03:25 +0200 Subject: [PATCH 317/994] Ensure that profile bar has no options selected if a quality_changes is active CURA-6598 --- .../Recommended/RecommendedQualityProfileSelector.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 0666853726..7ad3493dca 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -128,6 +128,11 @@ Item function checkedFunction(modelItem) { + if(Cura.MachineManager.hasCustomQuality) + { + // When user created profile is active, no quality tickbox should be active. + return false + } return Cura.MachineManager.activeQualityType == modelItem.quality_type } From 24d6d5b102d1a31121035a6e248b13947f397937 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 30 Jul 2019 14:20:58 +0200 Subject: [PATCH 318/994] Update intent models to also house nested qualities CURA-6598 --- cura/Machines/Models/IntentCategoryModel.py | 15 ++++++- cura/Machines/Models/IntentModel.py | 50 ++++++++++++++++++--- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 9a520a2d31..5211889801 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -5,9 +5,11 @@ from PyQt5.QtCore import Qt import collections from typing import TYPE_CHECKING +from cura.Machines.Models.IntentModel import IntentModel from cura.Settings.IntentManager import IntentManager from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry #To update the list if anything changes. +from PyQt5.QtCore import pyqtProperty, pyqtSignal if TYPE_CHECKING: from UM.Settings.ContainerRegistry import ContainerInterface @@ -15,12 +17,14 @@ if TYPE_CHECKING: from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") + ## Lists the intent categories that are available for the current printer # configuration. class IntentCategoryModel(ListModel): NameRole = Qt.UserRole + 1 IntentCategoryRole = Qt.UserRole + 2 WeightRole = Qt.UserRole + 3 + QualitiesRole = Qt.UserRole + 4 #Translations to user-visible string. Ordered by weight. #TODO: Create a solution for this name and weight to be used dynamically. @@ -29,6 +33,8 @@ class IntentCategoryModel(ListModel): name_translation["engineering"] = catalog.i18nc("@label", "Engineering") name_translation["smooth"] = catalog.i18nc("@label", "Smooth") + modelUpdated = pyqtSignal() + ## Creates a new model for a certain intent category. # \param The category to list the intent profiles for. def __init__(self, intent_category: str) -> None: @@ -38,6 +44,7 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.NameRole, "name") self.addRoleName(self.IntentCategoryRole, "intent_category") self.addRoleName(self.WeightRole, "weight") + self.addRoleName(self.QualitiesRole, "qualities") ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) @@ -55,9 +62,13 @@ class IntentCategoryModel(ListModel): available_categories = IntentManager.getInstance().currentAvailableIntentCategories() result = [] for category in available_categories: + qualities = IntentModel() + qualities.setIntentCategory(category) result.append({ "name": self.name_translation.get(category, catalog.i18nc("@label", "Unknown")), "intent_category": category, - "weight": list(self.name_translation.keys()).index(category) + "weight": list(self.name_translation.keys()).index(category), + "qualities": qualities }) - self.setItems(result) \ No newline at end of file + result.sort(key = lambda k: k["weight"]) + self.setItems(result) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 5a44883b76..b310ec47a6 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -7,6 +7,7 @@ from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.SettingFunction import SettingFunction from cura.Machines.ContainerTree import ContainerTree from cura.Settings.IntentManager import IntentManager @@ -16,18 +17,22 @@ import cura.CuraApplication class IntentModel(ListModel): NameRole = Qt.UserRole + 1 QualityTypeRole = Qt.UserRole + 2 + LayerHeightRole = Qt.UserRole + 3 + AvailableRole = Qt.UserRole + 4 def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) self.addRoleName(self.NameRole, "name") self.addRoleName(self.QualityTypeRole, "quality_type") + self.addRoleName(self.LayerHeightRole, "layer_height") + self.addRoleName(self.AvailableRole, "available") self._intent_category = "engineering" ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) - + self._layer_height_unit = "" # This is cached self._update() intentCategoryChanged = pyqtSignal() @@ -54,11 +59,42 @@ class IntentModel(ListModel): return quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() - for intent_category, quality_type in IntentManager.getInstance().getCurrentAvailableIntents(): - if intent_category == self._intent_category: - new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type}) - if self._intent_category == "default": #For Default we always list all quality types. We can't filter on available profiles since the empty intent is not a specific quality type. - for quality_type in quality_groups.keys(): - new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type}) + for quality_tuple, quality_group in quality_groups.items(): + new_items.append({"name": quality_group.name, + "quality_type": quality_tuple[1], + "layer_height": self._fetchLayerHeight(quality_group), + "available": True + }) + new_items = sorted(new_items, key=lambda x: x["layer_height"]) self.setItems(new_items) + + #TODO: Copied this from QualityProfilesDropdownMenuModel for the moment. This code duplication should be fixed. + def _fetchLayerHeight(self, quality_group) -> float: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine + if not self._layer_height_unit: + unit = global_stack.definition.getProperty("layer_height", "unit") + if not unit: + unit = "" + self._layer_height_unit = unit + + default_layer_height = global_stack.definition.getProperty("layer_height", "value") + + # Get layer_height from the quality profile for the GlobalStack + if quality_group.node_for_global is None: + return float(default_layer_height) + container = quality_group.node_for_global.getContainer() + + layer_height = default_layer_height + if container and container.hasProperty("layer_height", "value"): + layer_height = container.getProperty("layer_height", "value") + else: + # Look for layer_height in the GlobalStack from material -> definition + container = global_stack.definition + if container and container.hasProperty("layer_height", "value"): + layer_height = container.getProperty("layer_height", "value") + + if isinstance(layer_height, SettingFunction): + layer_height = layer_height(global_stack) + + return float(layer_height) From 5401a4db15f61ce72b0b5ed716ac4421d92e8519 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 30 Jul 2019 15:28:22 +0200 Subject: [PATCH 319/994] Ensure that each intent gets it's own bar in recommended CURA-6598 --- cura/Machines/Models/IntentModel.py | 31 ++++++++++++-- .../RecommendedQualityProfileSelector.qml | 42 ++++++++++--------- resources/qml/RadioCheckbar.qml | 21 ++++------ 3 files changed, 60 insertions(+), 34 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index b310ec47a6..666786e26a 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -19,6 +19,7 @@ class IntentModel(ListModel): QualityTypeRole = Qt.UserRole + 2 LayerHeightRole = Qt.UserRole + 3 AvailableRole = Qt.UserRole + 4 + IntentRole = Qt.UserRole + 5 def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) @@ -27,6 +28,7 @@ class IntentModel(ListModel): self.addRoleName(self.QualityTypeRole, "quality_type") self.addRoleName(self.LayerHeightRole, "layer_height") self.addRoleName(self.AvailableRole, "available") + self.addRoleName(self.IntentRole, "intent_category") self._intent_category = "engineering" @@ -59,12 +61,32 @@ class IntentModel(ListModel): return quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() + layer_heights_added = [] for quality_tuple, quality_group in quality_groups.items(): - new_items.append({"name": quality_group.name, + # Add the intents that are of the correct category + if quality_tuple[0] == self._intent_category: + layer_height = self._fetchLayerHeight(quality_group) + new_items.append({"name": quality_group.name, "quality_type": quality_tuple[1], - "layer_height": self._fetchLayerHeight(quality_group), - "available": True + "layer_height": layer_height, + "available": quality_group.is_available, + "intent_category": self._intent_category }) + layer_heights_added.append(layer_height) + + # Now that we added all intents that we found something for, ensure that we set add ticks (and layer_heights) + # for all groups that we don't have anything for (and set it to not available) + for quality_tuple, quality_group in quality_groups.items(): + # Add the intents that are of the correct category + if quality_tuple[0] != self._intent_category: + layer_height = self._fetchLayerHeight(quality_group) + if layer_height not in layer_heights_added: + new_items.append({"name": "Unavailable", + "quality_type": "", + "layer_height": layer_height, + "intent_category": self._intent_category, + "available": False}) + layer_heights_added.append(layer_height) new_items = sorted(new_items, key=lambda x: x["layer_height"]) self.setItems(new_items) @@ -98,3 +120,6 @@ class IntentModel(ListModel): layer_height = layer_height(global_stack) return float(layer_height) + + def __repr__(self): + return str(self.items) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 7ad3493dca..2c8843122d 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -7,7 +7,7 @@ import QtQuick.Controls 2.3 as Controls2 import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM -import Cura 1.0 as Cura +import Cura 1.6 as Cura // @@ -98,7 +98,8 @@ Item { id: activeProfileButtonGroup exclusive: true - onClicked: Cura.MachineManager.activeQualityGroup = button.identifier + onClicked: Cura.IntentManager.selectIntent(button.modelData.intent_category, button.modelData.quality_type) + } Cura.LabelBar @@ -114,29 +115,32 @@ Item modelKey: "layer_height" } - Cura.RadioCheckbar + Repeater { - anchors + model: Cura.IntentCategoryModel{} + Cura.RadioCheckbar { - left: parent.left - right: parent.right - } - - model: Cura.QualityProfilesDropDownMenuModel - buttonGroup: activeProfileButtonGroup - modelKey: "quality_group" - - function checkedFunction(modelItem) - { - if(Cura.MachineManager.hasCustomQuality) + anchors { - // When user created profile is active, no quality tickbox should be active. - return false + left: parent.left + right: parent.right } - return Cura.MachineManager.activeQualityType == modelItem.quality_type + dataModel: model["qualities"] + buttonGroup: activeProfileButtonGroup + + function checkedFunction(modelItem) + { + if(Cura.MachineManager.hasCustomQuality) + { + // When user created profile is active, no quality tickbox should be active. + return false + } + return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category + } + + isCheckedFunction: checkedFunction } - isCheckedFunction: checkedFunction } } } \ No newline at end of file diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 3044fedb86..1bc1c135f6 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -18,12 +18,7 @@ Item implicitWidth: 200 implicitHeight: checkboxSize - property var model: null - - // What key of the model should be used to set the identifier of the checkbox. - // This is used to figure out what checkbox just got toggled. Set a buttonGroup and listen to it's clicked signal. - // You can use button.identifier to figure out which button was clicked. - property string modelKey: "name" + property var dataModel: null // The horizontal inactive bar that sits behind the buttons Rectangle @@ -45,6 +40,7 @@ Item } } + RowLayout { id: buttonBar @@ -56,7 +52,7 @@ Item Repeater { id: repeater - model: base.model + model: base.dataModel height: checkboxSize Item { @@ -75,7 +71,9 @@ Item height: barSize width: buttonBar.width / (repeater.count - 1) - activeComponent.width - 2 color: defaultItemColor - + // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator + // but not when using the exact same QML in Cura. + y: 0.5 * checkboxSize anchors { right: activeComponent.left @@ -87,9 +85,7 @@ Item id: activeComponent sourceComponent: isEnabled? checkboxComponent : disabledComponent width: checkboxSize - // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator - // but not when using the exact same QML in Cura. - y: -0.5 * checkboxSize + property var modelItem: model } } @@ -127,7 +123,8 @@ Item ButtonGroup.group: buttonGroup width: checkboxSize height: checkboxSize - property var identifier: modelItem[base.modelKey] + property var modelData: modelItem + checked: isCheckedFunction(modelItem) indicator: Rectangle { From a9e09c6f54272a325691e86271afd774553f067d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 1 Aug 2019 14:22:33 +0200 Subject: [PATCH 320/994] Removed unused timer CURA-6598 --- .../RecommendedQualityProfileSelector.qml | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 2c8843122d..c465a2e2be 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -9,10 +9,6 @@ import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM import Cura 1.6 as Cura - -// -// Quality profile -// Item { id: qualityRow @@ -21,20 +17,6 @@ Item property real labelColumnWidth: Math.round(width / 3) property real settingsColumnWidth: width - labelColumnWidth - Timer - { - id: qualitySliderChangeTimer - interval: 50 - running: false - repeat: false - onTriggered: - { - var item = Cura.QualityProfilesDropDownMenuModel.getItem(qualitySlider.value); - Cura.MachineManager.activeQualityGroup = item.quality_group; - } - } - - // Here are the elements that are shown in the left column Item { @@ -46,7 +28,7 @@ Item { id: qualityRowTitle source: UM.Theme.getIcon("category_layer_height") - text: catalog.i18nc("@label", "Layer Height") + text: catalog.i18nc("@label", "Profiles") font: UM.Theme.getFont("medium") anchors.left: parent.left anchors.right: customisedSettings.left @@ -72,7 +54,7 @@ Item onClicked: { - // if the current profile is user-created, switch to a built-in quality + // If the current profile is user-created, switch to a built-in quality Cura.MachineManager.resetToUseDefaultQuality() } onEntered: From 94c2211e7fcf5d5d123bd92b2d6e5621a9d49053 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 1 Aug 2019 14:30:30 +0200 Subject: [PATCH 321/994] Further simplify the recommended print setup CURA-6598 --- .../Recommended/RecommendedPrintSetup.qml | 1 - .../RecommendedQualityProfileSelector.qml | 31 ------------------- 2 files changed, 32 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 6885f8c041..d9364681d2 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -27,7 +27,6 @@ Item Column { - width: parent.width - 2 * parent.padding spacing: UM.Theme.getSize("wide_margin").height anchors diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index c465a2e2be..4b9d158483 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -33,37 +33,6 @@ Item anchors.left: parent.left anchors.right: customisedSettings.left } - - UM.SimpleButton - { - id: customisedSettings - - visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.MachineManager.hasCustomQuality - height: visible ? UM.Theme.getSize("print_setup_icon").height : 0 - width: height - anchors - { - right: parent.right - rightMargin: UM.Theme.getSize("default_margin").width - leftMargin: UM.Theme.getSize("default_margin").width - verticalCenter: parent.verticalCenter - } - - color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("reset") - - onClicked: - { - // If the current profile is user-created, switch to a built-in quality - Cura.MachineManager.resetToUseDefaultQuality() - } - onEntered: - { - var tooltipContent = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.") - base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipContent) - } - onExited: base.hideTooltip() - } } Column From c51dfec29fd3a6c3ca828a5b3a8ed298a548f4d1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 1 Aug 2019 14:50:33 +0200 Subject: [PATCH 322/994] Ensure that the intent category names are displayed coorectly in recommended CURA-6598 --- .../RecommendedQualityProfileSelector.qml | 92 ++++++++++++------- 1 file changed, 59 insertions(+), 33 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 4b9d158483..ad26ac7ef4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -18,28 +18,12 @@ Item property real settingsColumnWidth: width - labelColumnWidth // Here are the elements that are shown in the left column - Item - { - id: titleRow - width: labelColumnWidth - height: childrenRect.height - - Cura.IconWithText - { - id: qualityRowTitle - source: UM.Theme.getIcon("category_layer_height") - text: catalog.i18nc("@label", "Profiles") - font: UM.Theme.getFont("medium") - anchors.left: parent.left - anchors.right: customisedSettings.left - } - } Column { anchors { - left: titleRow.right + left: parent.left right: parent.right } @@ -53,43 +37,85 @@ Item } - Cura.LabelBar + Item { - id: labelbar + height: childrenRect.height anchors { left: parent.left right: parent.right } + Cura.IconWithText + { + id: profileLabel + source: UM.Theme.getIcon("category_layer_height") + text: catalog.i18nc("@label", "Profiles") + font: UM.Theme.getFont("medium") + width: labelColumnWidth + } - model: Cura.QualityProfilesDropDownMenuModel - modelKey: "layer_height" + Cura.LabelBar + { + id: labelbar + anchors + { + left: profileLabel.right + right: parent.right + } + + model: Cura.QualityProfilesDropDownMenuModel + modelKey: "layer_height" + } } + Repeater { - model: Cura.IntentCategoryModel{} - Cura.RadioCheckbar + model: Cura.IntentCategoryModel {} + Item { anchors { left: parent.left right: parent.right } - dataModel: model["qualities"] - buttonGroup: activeProfileButtonGroup + height: childrenRect.height - function checkedFunction(modelItem) + Label { - if(Cura.MachineManager.hasCustomQuality) - { - // When user created profile is active, no quality tickbox should be active. - return false - } - return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category + id: intentCategoryLabel + text: model.name + width: labelColumnWidth - UM.Theme.getSize("section_icon").width + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("section_icon").width + UM.Theme.getSize("narrow_margin").width + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + elide: Text.ElideRight } - isCheckedFunction: checkedFunction + Cura.RadioCheckbar + { + anchors + { + left: intentCategoryLabel.right + right: parent.right + } + dataModel: model["qualities"] + buttonGroup: activeProfileButtonGroup + + function checkedFunction(modelItem) + { + if(Cura.MachineManager.hasCustomQuality) + { + // When user created profile is active, no quality tickbox should be active. + return false + } + return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category + } + + isCheckedFunction: checkedFunction + } } } From 7d65951f437f3e532eea573b59b2b7a5d37cd5c1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 5 Aug 2019 16:25:38 +0200 Subject: [PATCH 323/994] Refactor ComboBox to use states CURA-6598 --- resources/qml/Widgets/ComboBox.qml | 53 ++++++++++++++---------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index d1edcca69c..5a1ff16b95 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -14,40 +14,34 @@ import Cura 1.1 as Cura ComboBox { id: control - property bool highlighted: False + + states: [ + State + { + name: "disabled" + when: !control.enabled + PropertyChanges { target: backgroundRectangle.border; color: UM.Theme.getColor("setting_control_disabled_border")} + PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_disabled")} + PropertyChanges { target: contentLabel; color: UM.Theme.getColor("setting_control_disabled_text")} + }, + State + { + name: "highlighted" + when: control.hovered || control.activeFocus + PropertyChanges { target: backgroundRectangle.border; color: UM.Theme.getColor("setting_control_border_highlight") } + PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_highlight")} + } + ] + background: Rectangle { - color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled") - } - - if (control.hovered || control.activeFocus || control.highlighted) - { - return UM.Theme.getColor("setting_control_highlight") - } - - return UM.Theme.getColor("setting_control") - } + id: backgroundRectangle + color: UM.Theme.getColor("setting_control") radius: UM.Theme.getSize("setting_control_radius").width border.width: UM.Theme.getSize("default_lining").width - border.color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled_border") - } + border.color: UM.Theme.getColor("setting_control_border") - if (control.hovered || control.activeFocus || control.highlighted) - { - return UM.Theme.getColor("setting_control_border_highlight") - } - - return UM.Theme.getColor("setting_control_border") - } } indicator: UM.RecolorImage @@ -67,6 +61,7 @@ ComboBox contentItem: Label { + id: contentLabel anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width anchors.verticalCenter: parent.verticalCenter @@ -76,7 +71,7 @@ ComboBox textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") - color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") + color: UM.Theme.getColor("setting_control_text") elide: Text.ElideRight verticalAlignment: Text.AlignVCenter } From 92be2611783a8d391e216711e6b0c3892da1bd24 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 10:49:42 +0200 Subject: [PATCH 324/994] Update the profile selector to new style for the intents CURA-6598 --- .../Custom/CustomPrintSetup.qml | 107 ++++++-- .../Custom/QualitiesWithIntentMenu.qml | 242 ++++++++++++++++++ .../RecommendedQualityProfileSelector.qml | 1 - 3 files changed, 326 insertions(+), 24 deletions(-) create mode 100644 resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index e6a35455f2..1af3444e67 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.0 import QtQuick.Controls 1.1 as OldControls import UM 1.3 as UM -import Cura 1.0 as Cura +import Cura 1.6 as Cura Item @@ -18,18 +18,6 @@ Item property var extrudersModel: CuraApplication.getExtrudersModel() - // Profile selector row - GlobalProfileSelector - { - id: globalProfileRow - anchors - { - top: parent.top - left: parent.left - right: parent.right - margins: parent.padding - } - } Item { id: intent @@ -37,7 +25,7 @@ Item anchors { - top: globalProfileRow.bottom + top: parent.top topMargin: UM.Theme.getSize("default_margin").height left: parent.left leftMargin: parent.padding @@ -60,20 +48,93 @@ Item color: UM.Theme.getColor("text") verticalAlignment: Text.AlignVCenter } - OldControls.ToolButton + + Button { id: intentSelection - text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.intent.name : "" - tooltip: text - height: UM.Theme.getSize("print_setup_big_item").height - width: UM.Theme.getSize("print_setup_big_item").width - anchors.right: parent.right - style: UM.Theme.styles.print_setup_header_button - activeFocusOnPress: true + onClicked: menu.opened ? menu.close() : menu.open() + text: generateActiveQualityText() - menu: Cura.IntentMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } + anchors.right: parent.right + width: UM.Theme.getSize("print_setup_big_item").width + height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height + + contentItem: Label + { + id: textLabel + text: intentSelection.text + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.verticalCenter: intentSelection.verticalCenter + height: contentHeight + verticalAlignment: Text.AlignVCenter + } + + background: Rectangle + { + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + radius: UM.Theme.getSize("default_radius").width + } + + function generateActiveQualityText() + { + var result = Cura.MachineManager.activeQualityOrQualityChangesName + if (Cura.MachineManager.isActiveQualityExperimental) + { + result += " (Experimental)" + } + + if (Cura.MachineManager.isActiveQualitySupported) + { + if (Cura.MachineManager.activeQualityLayerHeight > 0) + { + result += " " + result += " - " + result += Cura.MachineManager.activeQualityLayerHeight + "mm" + result += "" + } + } + + return result + } + + UM.SimpleButton + { + id: customisedSettings + + visible: Cura.MachineManager.hasUserSettings + width: UM.Theme.getSize("print_setup_icon").width + height: UM.Theme.getSize("print_setup_icon").height + + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("thick_margin").width + + color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); + iconSource: UM.Theme.getIcon("star") + + onClicked: + { + forceActiveFocus(); + Cura.Actions.manageProfiles.trigger() + } + onEntered: + { + var content = catalog.i18nc("@tooltip", "Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.") + base.showTooltip(intent, Qt.point(-UM.Theme.getSize("default_margin").width, 0), content) + } + onExited: base.hideTooltip() + } } + QualitiesWithIntentMenu + { + id: menu + y: intentSelection.y + intentSelection.height + x: intentSelection.x + width: intentSelection.width + } } UM.TabRow diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml new file mode 100644 index 0000000000..1ba73bb029 --- /dev/null +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -0,0 +1,242 @@ +import QtQuick 2.0 +import QtQuick.Controls 2.3 +import Cura 1.6 as Cura + +import UM 1.2 as UM +Popup +{ + id: popup + implicitWidth: 400 + property var dataModel: Cura.IntentCategoryModel {} + + property int defaultMargin: 5 + property int checkmarkSize: 12 + property int buttonHeight: 25 + property color backgroundColor: "#f2f2f2" + property color borderColor: "#cccccc" + padding: 0 + + background: Rectangle + { + color: backgroundColor + border.width: 1 + border.color: borderColor + } + + ButtonGroup + { + id: buttonGroup + exclusive: true + onClicked: popup.visible = false + } + + contentItem: Column + { + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + + height: childrenRect.height + + // This repeater adds the intent labels + Repeater + { + model: dataModel + delegate: Item + { + // We need to set it like that, otherwise we'd have to set the sub model with model: model.qualities + // Which obviously won't work due to naming conflicts. + property variant subItemModel: model.qualities + + height: childrenRect.height + anchors + { + left: parent.left + leftMargin: defaultMargin + right: parent.right + rightMargin: defaultMargin + } + + Label + { + id: headerLabel + text: model.name + height: visible ? contentHeight: 0 + enabled: false + visible: qualitiesList.visibleChildren.length > 0 + } + + Column + { + id: qualitiesList + anchors.top: headerLabel.bottom + anchors.left: parent.left + anchors.right: parent.right + + // We set it by means of a binding, since then we can use the when condition, which we need to + // prevent a binding loop. + Binding + { + target: parent + property: "height" + value: parent.childrenRect.height + when: parent.visibleChildren.lengt > 0 + } + + // Add the qualities that belong to the intent + Repeater + { + visible: false + model: subItemModel + Button + { + id: button + + onClicked: Cura.IntentManager.selectIntent(model.intent_category, model.quality_type) + + width: parent.width + height: buttonHeight + checkable: true + visible: model.available + checked: + { + if(Cura.MachineManager.hasCustomQuality) + { + // When user created profile is active, no quality tickbox should be active. + return false + } + return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category + } + ButtonGroup.group: buttonGroup + background: Item {} + contentItem: Item + { + Rectangle + { + id: checkmark + width: checkmarkSize + height: checkmarkSize + anchors.verticalCenter: parent.verticalCenter + color: "black" + visible: button.checked + } + + Label + { + id: label + text: model.name + " - " + model.layer_height + " mm" + verticalAlignment: Text.AlignVCenter + anchors + { + left: checkmark.right + leftMargin: defaultMargin + top: parent.top + bottom: parent.bottom + right: parent.right + } + } + } + } + } + } + } + } + + Rectangle + { + height: 1 + anchors.left: parent.left + anchors.right: parent.right + color: borderColor + } + Button + { + text: Cura.Actions.addProfile.text + + anchors.left: parent.left + anchors.leftMargin: defaultMargin + + enabled: Cura.Actions.addProfile.enabled + background: Item {} + onClicked: + { + Cura.Actions.addProfile.trigger() + popup.visible = false + } + + } + Button + { + text: Cura.Actions.updateProfile.text + + anchors.left: parent.left + anchors.leftMargin: defaultMargin + + enabled: Cura.Actions.updateProfile.enabled + background: Item {} + onClicked: + { + popup.visible = false + Cura.Actions.updateProfile.trigger() + } + } + Button + { + text: catalog.i18nc("@action:button", "Discard current changes") + + anchors.left: parent.left + anchors.leftMargin: defaultMargin + + enabled: Cura.MachineManager.hasUserSettings + background: Item {} + onClicked: + { + popup.visible = false + Cura.ContainerManager.clearUserContainers() + } + } + Rectangle + { + height: 1 + anchors.left: parent.left + anchors.right: parent.right + color: borderColor + } + Button + { + id: manageProfilesButton + text: Cura.Actions.manageProfiles.text + anchors + { + left: parent.left + leftMargin: defaultMargin + right: parent.right + rightMargin: defaultMargin + } + + height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height + background: Item {} + contentItem: Item + { + width: manageProfilesButton.width + Label + { + id: textLabel + text: manageProfilesButton.text + height: contentHeight + } + Label + { + id: shortcutLabel + text: Cura.Actions.manageProfiles.shortcut + anchors.right: parent.right + } + } + onClicked: + { + popup.visible = false + Cura.Actions.manageProfiles.trigger() + } + } + } +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index ad26ac7ef4..9194f3c85c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -34,7 +34,6 @@ Item id: activeProfileButtonGroup exclusive: true onClicked: Cura.IntentManager.selectIntent(button.modelData.intent_category, button.modelData.quality_type) - } Item From 6751dc4fc850c4d5d518e10a5c97b9af271d55f8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 12:41:37 +0200 Subject: [PATCH 325/994] Remove unused QML component CURA-6598 --- .../Custom/GlobalProfileSelector.qml | 100 ------------------ 1 file changed, 100 deletions(-) delete mode 100644 resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml diff --git a/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml b/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml deleted file mode 100644 index 32c07a52a6..0000000000 --- a/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.7 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 -import QtQuick.Layouts 1.2 - -import UM 1.2 as UM -import Cura 1.0 as Cura - -Item -{ - id: globalProfileRow - height: childrenRect.height - - Label - { - id: globalProfileLabel - anchors - { - top: parent.top - bottom: parent.bottom - left: parent.left - right: globalProfileSelection.left - } - text: catalog.i18nc("@label", "Profile") - font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - verticalAlignment: Text.AlignVCenter - } - - ToolButton - { - id: globalProfileSelection - - text: generateActiveQualityText() - width: UM.Theme.getSize("print_setup_big_item").width - height: UM.Theme.getSize("print_setup_big_item").height - anchors - { - top: parent.top - right: parent.right - } - tooltip: Cura.MachineManager.activeQualityOrQualityChangesName - style: UM.Theme.styles.print_setup_header_button - activeFocusOnPress: true - menu: Cura.ProfileMenu { } - - function generateActiveQualityText() - { - var result = Cura.MachineManager.activeQualityOrQualityChangesName - if (Cura.MachineManager.isActiveQualityExperimental) - { - result += " (Experimental)" - } - - if (Cura.MachineManager.isActiveQualitySupported) - { - if (Cura.MachineManager.activeQualityLayerHeight > 0) - { - result += " " - result += " - " - result += Cura.MachineManager.activeQualityLayerHeight + "mm" - result += "" - } - } - - return result - } - - UM.SimpleButton - { - id: customisedSettings - - visible: Cura.MachineManager.hasUserSettings - width: UM.Theme.getSize("print_setup_icon").width - height: UM.Theme.getSize("print_setup_icon").height - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: Math.round(UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("thick_margin").width) - - color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); - iconSource: UM.Theme.getIcon("star") - - onClicked: - { - forceActiveFocus(); - Cura.Actions.manageProfiles.trigger() - } - onEntered: - { - var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.") - base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("default_margin").width, 0), content) - } - onExited: base.hideTooltip() - } - } -} \ No newline at end of file From 5acc3111e00d152609fdd0101cf7b761f8261bcb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 12:58:53 +0200 Subject: [PATCH 326/994] Some minor UI fixes CURA-6598 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 1af3444e67..4c3e2d395b 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -35,7 +35,7 @@ Item Label { - id: intentLabel + id: profileLabel anchors { top: parent.top @@ -43,7 +43,7 @@ Item left: parent.left right: intentSelection.left } - text: catalog.i18nc("@label", "Intent") + text: catalog.i18nc("@label", "Profile") font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") verticalAlignment: Text.AlignVCenter @@ -75,6 +75,7 @@ Item border.color: UM.Theme.getColor("lining") border.width: UM.Theme.getSize("default_lining").width radius: UM.Theme.getSize("default_radius").width + color: UM.Theme.getColor("main_background") } function generateActiveQualityText() From 87fedc26207ab9e1f20637a0e051523c825d210b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 13:08:55 +0200 Subject: [PATCH 327/994] Fix elide for the variant in configuration menu --- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 77164429b3..fb074e948c 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -99,12 +99,14 @@ Cura.ExpandablePopup left: extruderIcon.right leftMargin: UM.Theme.getSize("default_margin").width top: typeAndBrandNameLabel.bottom + right: parent.right + rightMargin: UM.Theme.getSize("default_margin").width } } } } - //Placeholder text if there is a configuration to select but no materials (so we can't show the materials per extruder). + // Placeholder text if there is a configuration to select but no materials (so we can't show the materials per extruder). Label { text: catalog.i18nc("@label", "Select configuration") From 8445ebe8cfaf0ad3fd46e36047514b88b32eb94e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 13:13:54 +0200 Subject: [PATCH 328/994] Remove menu that is no longer used CURA-6598 --- resources/qml/Menus/IntentMenu.qml | 64 ------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 resources/qml/Menus/IntentMenu.qml diff --git a/resources/qml/Menus/IntentMenu.qml b/resources/qml/Menus/IntentMenu.qml deleted file mode 100644 index 8aba7cbde6..0000000000 --- a/resources/qml/Menus/IntentMenu.qml +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2019 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.7 -import QtQuick.Controls 1.4 - -import UM 1.2 as UM -import Cura 1.6 as Cura - -Menu -{ - id: menu - title: "Intent" - - property int extruderIndex: 0 - - Cura.IntentCategoryModel - { - id: intentCategoryModel - } - - Instantiator - { - model: intentCategoryModel - - MenuItem //Section header. - { - text: model.name - enabled: false - checked: false - - property var per_category_intents: Cura.IntentModel - { - id: intentModel - intentCategory: model.intent_category - } - - property var intent_instantiator: Instantiator - { - model: intentModel - MenuItem - { - text: model.name - checkable: true - checked: false - Binding on checked - { - when: Cura.MachineManager.activeStack != null - value: Cura.MachineManager.activeStack.intent.metaData["intent_category"] == intentModel.intentCategory && Cura.MachineManager.activeStack.quality.metaData["quality_type"] == model.quality_type - } - exclusiveGroup: group - onTriggered: Cura.IntentManager.selectIntent(intentModel.intentCategory, model.quality_type) - } - - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - } - } - - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - } - ExclusiveGroup { id: group } -} From f7e6f22e6c73e1af5a5fa9e0ecae820500d01b66 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 13:33:17 +0200 Subject: [PATCH 329/994] Fix typo CURA-6598 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 1ba73bb029..d52f890a4d 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -80,7 +80,7 @@ Popup target: parent property: "height" value: parent.childrenRect.height - when: parent.visibleChildren.lengt > 0 + when: parent.visibleChildren.length > 0 } // Add the qualities that belong to the intent From d5bbc3f205433e37eb76e1891c77b4b5390acce9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 13:34:35 +0200 Subject: [PATCH 330/994] Remove reference to unknown component CURA-6598 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 4c3e2d395b..400b148896 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -205,7 +205,7 @@ Item { anchors { - top: tabBar.visible ? tabBar.bottom : globalProfileRow.bottom + top: tabBar.visible ? tabBar.bottom : intent.bottom topMargin: -UM.Theme.getSize("default_lining").width left: parent.left leftMargin: parent.padding From 210a2aa6bb506eb341f06c9c24751ac314cc1703 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 15:13:06 +0200 Subject: [PATCH 331/994] Add arrow indicator to the custom print setup CURA-6598 --- .../Custom/CustomPrintSetup.qml | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 400b148896..0941c98cfb 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -109,8 +109,8 @@ Item height: UM.Theme.getSize("print_setup_icon").height anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("thick_margin").width + anchors.right: downArrow.left + anchors.rightMargin: UM.Theme.getSize("default_margin").width color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); iconSource: UM.Theme.getIcon("star") @@ -127,6 +127,24 @@ Item } onExited: base.hideTooltip() } + UM.RecolorImage + { + id: downArrow + + + source: UM.Theme.getIcon("arrow_bottom") + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height + + anchors + { + right: parent.right + verticalCenter: parent.verticalCenter + rightMargin: UM.Theme.getSize("default_margin").width + } + + color: UM.Theme.getColor("setting_control_button") + } } QualitiesWithIntentMenu From 5ab31df73800f791ce01a8060a868045a3fc894a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 15:19:01 +0200 Subject: [PATCH 332/994] Add hover effect to quality/intent selector CURA-6598 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 0941c98cfb..13df330fb8 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -58,6 +58,7 @@ Item anchors.right: parent.right width: UM.Theme.getSize("print_setup_big_item").width height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height + hoverEnabled: true contentItem: Label { @@ -72,7 +73,8 @@ Item background: Rectangle { - border.color: UM.Theme.getColor("lining") + id: backgroundItem + border.color: intentSelection.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border") border.width: UM.Theme.getSize("default_lining").width radius: UM.Theme.getSize("default_radius").width color: UM.Theme.getColor("main_background") From 0891abf8afdf1516f128a38a987b0b3df0e566d6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Aug 2019 17:08:23 +0200 Subject: [PATCH 333/994] Fix hover & highlighting for the qualities& intent menu CURA-6598 --- .../PrintSetupSelector/Custom/MenuButton.qml | 47 +++++++++++++ .../Custom/QualitiesWithIntentMenu.qml | 67 ++++++------------- 2 files changed, 66 insertions(+), 48 deletions(-) create mode 100644 resources/qml/PrintSetupSelector/Custom/MenuButton.qml diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml new file mode 100644 index 0000000000..ee1be80075 --- /dev/null +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -0,0 +1,47 @@ +import QtQuick 2.0 +import QtQuick.Controls 2.3 +import Cura 1.6 as Cura + +import UM 1.2 as UM + +Button +{ + // This is a work around for a qml issue. Since the default button uses a private implementation for contentItem + // (the so called IconText), which handles the mnemonic conversion (aka; ensuring that &Button) text property + // is rendered with the B underlined. Since we're also forced to mix controls 1.0 and 2.0 actions together, + // we need a special property for the text of the label if we do want it to be rendered correclty, but don't want + // another shortcut to be added (which will cause for "QQuickAction::event: Ambiguous shortcut overload: " to + // happen. + property string labelText: "" + id: button + hoverEnabled: true + + background: Rectangle + { + id: backgroundRectangle + border.width: 1 + border.color: button.checked ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" + color: button.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + } + + // Workarround to ensure that the mnemonic highlighting happens correctly + function replaceText(txt) + { + var index = txt.indexOf("&") + if(index >= 0) + { + txt = txt.replace(txt.substr(index, 2), ("" + txt.substr(index + 1, 1) + "")) + } + return txt + } + + contentItem: Label + { + id: textLabel + text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText) + height: contentHeight + verticalAlignment: Text.AlignVCenter + anchors.left: button.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + } +} \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index d52f890a4d..314a2bd095 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -52,9 +52,7 @@ Popup anchors { left: parent.left - leftMargin: defaultMargin right: parent.right - rightMargin: defaultMargin } Label @@ -64,6 +62,8 @@ Popup height: visible ? contentHeight: 0 enabled: false visible: qualitiesList.visibleChildren.length > 0 + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("narrow_margin").width } Column @@ -88,16 +88,16 @@ Popup { visible: false model: subItemModel - Button + MenuButton { id: button onClicked: Cura.IntentManager.selectIntent(model.intent_category, model.quality_type) width: parent.width - height: buttonHeight checkable: true visible: model.available + text: model.name + " - " + model.layer_height + " mm" checked: { if(Cura.MachineManager.hasCustomQuality) @@ -108,34 +108,7 @@ Popup return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category } ButtonGroup.group: buttonGroup - background: Item {} - contentItem: Item - { - Rectangle - { - id: checkmark - width: checkmarkSize - height: checkmarkSize - anchors.verticalCenter: parent.verticalCenter - color: "black" - visible: button.checked - } - Label - { - id: label - text: model.name + " - " + model.layer_height + " mm" - verticalAlignment: Text.AlignVCenter - anchors - { - left: checkmark.right - leftMargin: defaultMargin - top: parent.top - bottom: parent.bottom - right: parent.right - } - } - } } } } @@ -149,46 +122,43 @@ Popup anchors.right: parent.right color: borderColor } - Button + MenuButton { - text: Cura.Actions.addProfile.text + labelText: Cura.Actions.addProfile.text anchors.left: parent.left - anchors.leftMargin: defaultMargin + anchors.right: parent.right enabled: Cura.Actions.addProfile.enabled - background: Item {} onClicked: { Cura.Actions.addProfile.trigger() popup.visible = false } - } - Button + MenuButton { - text: Cura.Actions.updateProfile.text - + labelText: Cura.Actions.updateProfile.text anchors.left: parent.left - anchors.leftMargin: defaultMargin + anchors.right: parent.right enabled: Cura.Actions.updateProfile.enabled - background: Item {} + onClicked: { popup.visible = false Cura.Actions.updateProfile.trigger() } } - Button + MenuButton { text: catalog.i18nc("@action:button", "Discard current changes") anchors.left: parent.left - anchors.leftMargin: defaultMargin + anchors.right: parent.right enabled: Cura.MachineManager.hasUserSettings - background: Item {} + onClicked: { popup.visible = false @@ -202,20 +172,19 @@ Popup anchors.right: parent.right color: borderColor } - Button + + MenuButton { id: manageProfilesButton text: Cura.Actions.manageProfiles.text anchors { left: parent.left - leftMargin: defaultMargin right: parent.right - rightMargin: defaultMargin } height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height - background: Item {} + contentItem: Item { width: manageProfilesButton.width @@ -224,6 +193,8 @@ Popup id: textLabel text: manageProfilesButton.text height: contentHeight + anchors.left: button.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width } Label { From 4520ee7e1c6663608ad108c2d21f6344cb5fedd2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 09:58:14 +0200 Subject: [PATCH 334/994] Added rounded corners to the intent menu CURA-6598 --- .../Custom/QualitiesWithIntentMenu.qml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 314a2bd095..a7caba3d95 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -12,15 +12,17 @@ Popup property int defaultMargin: 5 property int checkmarkSize: 12 property int buttonHeight: 25 - property color backgroundColor: "#f2f2f2" - property color borderColor: "#cccccc" + property color backgroundColor: UM.Theme.getColor("main_background") + property color borderColor: UM.Theme.getColor("lining") + padding: 0 - background: Rectangle + background: Cura.RoundedRectangle { color: backgroundColor - border.width: 1 + border.width: UM.Theme.getSize("default_lining").width border.color: borderColor + cornerSide: Cura.RoundedRectangle.Direction.Down } ButtonGroup @@ -33,11 +35,11 @@ Popup contentItem: Column { anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_lining").width + anchors.rightMargin: UM.Theme.getSize("default_lining").width anchors.right: parent.right anchors.top: parent.top - height: childrenRect.height - // This repeater adds the intent labels Repeater { @@ -209,5 +211,11 @@ Popup Cura.Actions.manageProfiles.trigger() } } + // spacer + Item + { + width: 2 + height: UM.Theme.getSize("default_radius").width + } } } From 7c832e7ea367ac408ecd68a4a6ab691163199fba Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 10:58:50 +0200 Subject: [PATCH 335/994] Intents are now also displayed in active profile labels CURA-6598 --- .../qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 9 ++++++++- .../PrintSetupSelector/PrintSetupSelectorHeader.qml | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 13df330fb8..656f58ac28 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -82,7 +82,14 @@ Item function generateActiveQualityText() { - var result = Cura.MachineManager.activeQualityOrQualityChangesName + + var result = "" + if(Cura.MachineManager.activeIntentCategory != "default") + { + result += Cura.MachineManager.activeIntentCategory + " - " + } + + result += Cura.MachineManager.activeQualityOrQualityChangesName if (Cura.MachineManager.isActiveQualityExperimental) { result += " (Experimental)" diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 96b244d803..30691d32b9 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -20,10 +20,16 @@ RowLayout { if (Cura.MachineManager.activeStack) { - var text = Cura.MachineManager.activeQualityOrQualityChangesName + var text = "" + if(Cura.MachineManager.activeIntentCategory != "default") + { + text += Cura.MachineManager.activeIntentCategory + " - " + } + + text += Cura.MachineManager.activeQualityOrQualityChangesName if (!Cura.MachineManager.hasNotSupportedQuality) { - text += " " + layerHeight.properties.value + "mm" + text += " - " + layerHeight.properties.value + "mm" text += Cura.MachineManager.isActiveQualityExperimental ? " - " + catalog.i18nc("@label", "Experimental") : "" } return text From 6220dfd15354ce62ea5b01fd242eaa7113369f9e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 11:02:17 +0200 Subject: [PATCH 336/994] Remove profile menu CURA-6598 --- resources/qml/Menus/ProfileMenu.qml | 84 ---------------------------- resources/qml/Menus/SettingsMenu.qml | 1 - 2 files changed, 85 deletions(-) delete mode 100644 resources/qml/Menus/ProfileMenu.qml diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml deleted file mode 100644 index 68260f2502..0000000000 --- a/resources/qml/Menus/ProfileMenu.qml +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.7 -import QtQuick.Controls 1.4 - -import UM 1.2 as UM -import Cura 1.0 as Cura - -Menu -{ - id: menu - - Instantiator - { - model: Cura.QualityProfilesDropDownMenuModel - - MenuItem - { - text: - { - var full_text = (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name - full_text += model.is_experimental ? " - " + catalog.i18nc("@label", "Experimental") : "" - return full_text - } - checkable: true - checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name - exclusiveGroup: group - onTriggered: Cura.MachineManager.setQualityGroup(model.quality_group) - visible: model.available - } - - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - } - - MenuSeparator - { - id: customSeparator - visible: Cura.CustomQualityProfilesDropDownMenuModel.count > 0 - } - - Instantiator - { - id: customProfileInstantiator - model: Cura.CustomQualityProfilesDropDownMenuModel - - Connections - { - target: Cura.CustomQualityProfilesDropDownMenuModel - onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.count > 0 - } - - MenuItem - { - text: model.name - checkable: true - checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name - exclusiveGroup: group - onTriggered: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group) - } - - onObjectAdded: - { - customSeparator.visible = model.count > 0; - menu.insertItem(index, object); - } - onObjectRemoved: - { - customSeparator.visible = model.count > 0; - menu.removeItem(object); - } - } - - ExclusiveGroup { id: group; } - - MenuSeparator { id: profileMenuSeparator } - - MenuItem { action: Cura.Actions.addProfile } - MenuItem { action: Cura.Actions.updateProfile } - MenuItem { action: Cura.Actions.resetProfile } - MenuSeparator { } - MenuItem { action: Cura.Actions.manageProfiles } -} diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 2845101dbf..f885120220 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -63,7 +63,6 @@ Menu title: catalog.i18nc("@title:menu", "&Build plate") visible: CuraSDKVersion == "dev" && Cura.MachineManager.hasVariantBuildplates } - ProfileMenu { title: catalog.i18nc("@title:settings", "&Profile") } MenuSeparator { } From a3d3580e2af3bdf0b5bc8eba05cde082a7b89187 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 11:04:54 +0200 Subject: [PATCH 337/994] Remove buildplate menu The menu wasn't used anymore and leaving it in just makes things more complicated --- resources/qml/Menus/BuildplateMenu.qml | 36 -------------------------- resources/qml/Menus/SettingsMenu.qml | 7 ----- 2 files changed, 43 deletions(-) delete mode 100644 resources/qml/Menus/BuildplateMenu.qml diff --git a/resources/qml/Menus/BuildplateMenu.qml b/resources/qml/Menus/BuildplateMenu.qml deleted file mode 100644 index b924aa0879..0000000000 --- a/resources/qml/Menus/BuildplateMenu.qml +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.7 -import QtQuick.Controls 1.4 - -import UM 1.2 as UM -import Cura 1.0 as Cura - -Menu -{ - id: menu - title: "Build plate" - - property var buildPlateModel: CuraApplication.getBuildPlateModel() - - Instantiator - { - model: menu.buildPlateModel - - MenuItem { - text: model.name - checkable: true - checked: model.name == Cura.MachineManager.globalVariantName - exclusiveGroup: group - onTriggered: { - Cura.MachineManager.setGlobalVariant(model.container_node); - } - } - - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - } - - ExclusiveGroup { id: group } -} diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index f885120220..17a4f6734a 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -57,13 +57,6 @@ Menu onObjectRemoved: base.removeItem(object) } - // TODO Only show in dev mode. Remove check when feature ready - BuildplateMenu - { - title: catalog.i18nc("@title:menu", "&Build plate") - visible: CuraSDKVersion == "dev" && Cura.MachineManager.hasVariantBuildplates - } - MenuSeparator { } MenuItem { action: Cura.Actions.configureSettingVisibility } From c7b6133e3dd4c0cd53ecb0c5f754f1f818535025 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Aug 2019 11:27:02 +0200 Subject: [PATCH 338/994] Some UI polishing CURA-6598 --- resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 3 ++- .../Custom/QualitiesWithIntentMenu.qml | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index ee1be80075..1652b71213 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -22,6 +22,7 @@ Button border.width: 1 border.color: button.checked ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" color: button.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + radius: UM.Theme.getSize("action_button_radius").width } // Workarround to ensure that the mnemonic highlighting happens correctly @@ -42,6 +43,6 @@ Button height: contentHeight verticalAlignment: Text.AlignVCenter anchors.left: button.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.leftMargin: UM.Theme.getSize("wide_margin").width } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index a7caba3d95..6d51b9005b 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -65,7 +65,7 @@ Popup enabled: false visible: qualitiesList.visibleChildren.length > 0 anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("narrow_margin").width + anchors.leftMargin: UM.Theme.getSize("default_margin").width } Column @@ -195,14 +195,18 @@ Popup id: textLabel text: manageProfilesButton.text height: contentHeight - anchors.left: button.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width + verticalAlignment: Text.AlignVCenter } Label { id: shortcutLabel text: Cura.Actions.manageProfiles.shortcut + height: contentHeight anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + verticalAlignment: Text.AlignVCenter } } onClicked: From b56c09bcf43345e4953a5f44642c2eb709382745 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 7 Aug 2019 15:50:00 +0200 Subject: [PATCH 339/994] Fix recommended-menu layer-height-label for Qt-5.10.0 part of CURA-6598 --- resources/qml/LabelBar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index ea29df0e06..6edfb3866c 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -28,7 +28,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true - Layout.maximumWidth: index + 1 === repeater.count ? itemSize: 200000000 + Layout.maximumWidth: index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1) height: childrenRect.height Label { From f4dc93fc39a27402deea1f5bfbfbb54b42a558ca Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 11:57:03 +0200 Subject: [PATCH 340/994] Prevent crash in model if no extruder is set CURA-6598 --- cura/Machines/Models/BaseMaterialsModel.py | 2 ++ resources/qml/Settings/SettingComboBox.qml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 3ab11b7e9d..8d7e8bda95 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -103,6 +103,8 @@ class BaseMaterialsModel(ListModel): # tree. This change may trigger an _update() call when the materials # changed for the configuration that this model is looking for. def _materialsListChanged(self, material: MaterialNode) -> None: + if self._extruder_stack is None: + return if material.variant.container_id != self._extruder_stack.variant.getId(): return if material.variant.machine.container_id != cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack().definition.getId(): diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 0b7f494a7d..1814d997b3 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/resources/qml/Settings/SettingComboBox.qml @@ -20,8 +20,7 @@ SettingItem textRole: "value" anchors.fill: parent - highlighted: base.hovered - + onActivated: { forceActiveFocus() From d59d7e5b8dc73b149eae6892f12243b6095e73b1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 13:09:42 +0200 Subject: [PATCH 341/994] Bump version nr --- resources/intent/smooth.inst.cfg | 2 +- resources/intent/strong.inst.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index cfaa18c2bf..2ec33da504 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -4,7 +4,7 @@ name = Smooth (TEST INTENT) definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index e90b73d7d8..d0354070a0 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -4,7 +4,7 @@ name = Strong (TEST INTENT) definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = intent intent_category = engineering quality_type = draft From a8b818fbdc14d8205e8d91f6236f1361746f37ee Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 13:52:01 +0200 Subject: [PATCH 342/994] Ensure that right intents are added to the tree CURA-6598 --- cura/Machines/IntentNode.py | 5 ++++- cura/Machines/QualityNode.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index 232498536c..521e7f2e38 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -3,6 +3,7 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Machines.ContainerNode import ContainerNode if TYPE_CHECKING: @@ -14,4 +15,6 @@ if TYPE_CHECKING: class IntentNode(ContainerNode): def __init__(self, container_id: str, quality: "QualityNode") -> None: super().__init__(container_id) - self.quality = quality \ No newline at end of file + self.quality = quality + my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id=container_id)[0] + self.intent_category = my_metadata.get("intent_category", "default") \ No newline at end of file diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 451c8babfb..7980f4ed63 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -31,8 +31,8 @@ class QualityNode(ContainerNode): # Find all intent profiles that fit the current configuration. from cura.Machines.MachineNode import MachineNode if not isinstance(self.parent, MachineNode): # Not a global profile. - for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): + for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file, quality_type = self.quality_type): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) - if not self.intents: - self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) + + self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) # Otherwise, there are no intents for global profiles. \ No newline at end of file From ba0c16d96851580f556a4bf2ee030c56626af3c4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 13:53:23 +0200 Subject: [PATCH 343/994] Update intents model to use container tree CURA-6598 --- cura/Machines/Models/IntentModel.py | 30 ++++++++++++++-------- resources/qml/Settings/SettingComboBox.qml | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 666786e26a..5b4ce10878 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -10,6 +10,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.SettingFunction import SettingFunction from cura.Machines.ContainerTree import ContainerTree +from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.IntentManager import IntentManager import cura.CuraApplication @@ -61,18 +62,27 @@ class IntentModel(ListModel): return quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() + container_tree = ContainerTree.getInstance() + machine_node = container_tree.machines[global_stack.definition.getId()] + active_extruder = ExtruderManager.getInstance().getActiveExtruderStack() + active_variant_name = active_extruder.variant.getMetaDataEntry("name") + active_variant_node = machine_node.variants[active_variant_name] + active_material_node = active_variant_node.materials[active_extruder.material.getMetaDataEntry("base_file")] layer_heights_added = [] - for quality_tuple, quality_group in quality_groups.items(): - # Add the intents that are of the correct category - if quality_tuple[0] == self._intent_category: - layer_height = self._fetchLayerHeight(quality_group) - new_items.append({"name": quality_group.name, - "quality_type": quality_tuple[1], - "layer_height": layer_height, - "available": quality_group.is_available, - "intent_category": self._intent_category - }) + for quality_id, quality_node in active_material_node.qualities.items(): + quality_group = quality_groups[quality_node.quality_type] + layer_height = self._fetchLayerHeight(quality_group) + + for intent_id, intent_node in quality_node.intents.items(): + if intent_node.intent_category != self._intent_category: + continue layer_heights_added.append(layer_height) + new_items.append({"name": quality_group.name, + "quality_type": quality_group.quality_type, + "layer_height": layer_height, + "available": quality_group.is_available, + "intent_category": self._intent_category + }) # Now that we added all intents that we found something for, ensure that we set add ticks (and layer_heights) # for all groups that we don't have anything for (and set it to not available) diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 1814d997b3..cbabb3ffd4 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/resources/qml/Settings/SettingComboBox.qml @@ -20,7 +20,7 @@ SettingItem textRole: "value" anchors.fill: parent - + onActivated: { forceActiveFocus() From de1065f0a3a732004b0a0441d1ddd32a50087688 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 14:04:05 +0200 Subject: [PATCH 344/994] Prevent crash if extruder is not yet set CURA-6598 --- cura/Machines/Models/IntentModel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 5b4ce10878..e76c73cde1 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -65,6 +65,8 @@ class IntentModel(ListModel): container_tree = ContainerTree.getInstance() machine_node = container_tree.machines[global_stack.definition.getId()] active_extruder = ExtruderManager.getInstance().getActiveExtruderStack() + if not active_extruder: + return active_variant_name = active_extruder.variant.getMetaDataEntry("name") active_variant_node = machine_node.variants[active_variant_name] active_material_node = active_variant_node.materials[active_extruder.material.getMetaDataEntry("base_file")] From 68d3cf841296be622deb4e7ac87a6d888fff9c92 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 14:12:17 +0200 Subject: [PATCH 345/994] Fix binding loop in LabelBar CURA-6598 --- resources/qml/LabelBar.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index 6edfb3866c..f6e655de79 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -17,7 +17,7 @@ Item { anchors.left: parent.left anchors.right: parent.right - height: childrenRect.height + height: label.height spacing: 0 Repeater { @@ -27,9 +27,8 @@ Item Item { Layout.fillWidth: true - Layout.fillHeight: true Layout.maximumWidth: index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1) - height: childrenRect.height + height: label.height Label { id: label From c80cd9679ff8ad6680d7f6387aa0072ec37527d2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 15:15:35 +0200 Subject: [PATCH 346/994] Fix RadioCheckbars layout getting out of wack sometimes CURA-6598 --- .../Recommended/RecommendedQualityProfileSelector.qml | 7 ++++++- resources/qml/RadioCheckbar.qml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 9194f3c85c..2742605399 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -78,7 +78,7 @@ Item left: parent.left right: parent.right } - height: childrenRect.height + height: intentCategoryLabel.height Label { @@ -110,6 +110,11 @@ Item // When user created profile is active, no quality tickbox should be active. return false } + + if(modelItem === null) + { + return false + } return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category } diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 1bc1c135f6..4f959fc8fd 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -57,10 +57,11 @@ Item Item { Layout.fillWidth: true + Layout.fillHeight: true // The last item of the repeater needs to be shorter, as we don't need another part to fit // the horizontal bar. The others should essentially not be limited. Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 - height: activeComponent.height + property bool isEnabled: model.available // The horizontal bar between the checkable options. // Note that the horizontal bar points towards the previous item. From 04997fca7fc2eafc22f9646f96351df0f5d919de Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 15:52:02 +0200 Subject: [PATCH 347/994] Add property for active intent category CURA-6598 --- cura/Settings/MachineManager.py | 10 ++++++++++ cura/Settings/cura_empty_instance_containers.py | 1 + 2 files changed, 11 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index e0293c200f..7e25cd5d57 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -132,6 +132,7 @@ class MachineManager(QObject): activeMaterialChanged = pyqtSignal() activeVariantChanged = pyqtSignal() activeQualityChanged = pyqtSignal() + activeIntentChanged = pyqtSignal() activeStackChanged = pyqtSignal() # Emitted whenever the active stack is changed (ie: when changing between extruders, changing a profile, but not when changing a value) extruderChanged = pyqtSignal() @@ -270,6 +271,7 @@ class MachineManager(QObject): self.activeQualityChanged.emit() self.activeVariantChanged.emit() self.activeMaterialChanged.emit() + self.activeIntentChanged.emit() self.rootMaterialChanged.emit() self.numberExtrudersEnabledChanged.emit() @@ -607,6 +609,14 @@ class MachineManager(QObject): return False return Util.parseBool(global_container_stack.quality.getMetaDataEntry("is_experimental", False)) + @pyqtProperty(str, notify=activeIntentChanged) + def activeIntentCategory(self): + + if not self._active_container_stack: + return "" + intent_category = self._active_container_stack.intent.getMetaDataEntry("intent_category") + return intent_category + ## Returns whether there is anything unsupported in the current set-up. # # The current set-up signifies the global stack and all extruder stacks, diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index e8a6df8ff1..0ab37c5435 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -47,6 +47,7 @@ EMPTY_INTENT_CONTAINER_ID = "empty_intent" empty_intent_container = copy.deepcopy(empty_container) empty_intent_container.setMetaDataEntry("id", EMPTY_INTENT_CONTAINER_ID) empty_intent_container.setMetaDataEntry("type", "intent") +empty_intent_container.setMetaDataEntry("intent_category", "default") empty_intent_container.setName(catalog.i18nc("@info:No intent profile selected", "Default")) From d548404dfd4ae235b90861f4a65b4251e6c7ce4f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 16:23:10 +0200 Subject: [PATCH 348/994] Fix typing issues --- cura/CuraApplication.py | 4 ++-- cura/Machines/Models/MaterialManagementModel.py | 5 ++++- cura/Machines/VariantNode.py | 3 ++- cura/Settings/MachineManager.py | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index a70ca56da7..b704fb35b2 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -921,12 +921,12 @@ class CuraApplication(QtApplication): # Can't deprecate this function since the deprecation marker collides with pyqtSlot! @pyqtSlot(result = QObject) - def getMaterialManager(self, *args) -> "MaterialManager": + def getMaterialManager(self, *args) -> cura.Machines.MaterialManager.MaterialManager: return cura.Machines.MaterialManager.MaterialManager.getInstance() # Can't deprecate this function since the deprecation marker collides with pyqtSlot! @pyqtSlot(result = QObject) - def getQualityManager(self, *args) -> "QualityManager": + def getQualityManager(self, *args) -> cura.Machines.QualityManager.QualityManager: return cura.Machines.QualityManager.QualityManager.getInstance() def getIntentManager(self, *args) -> IntentManager: diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 90e63e6240..f9af587293 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -152,7 +152,10 @@ class MaterialManagementModel(QObject): extruder_stack = application.getMachineManager().activeStack active_variant_name = extruder_stack.variant.getName() approximate_diameter = int(extruder_stack.approximateMaterialDiameter) - machine_node = ContainerTree.getInstance().machines[application.getGlobalContainerStack().definition.getId()] + global_container_stack = application.getGlobalContainerStack() + if not global_container_stack: + return "" + machine_node = ContainerTree.getInstance().machines[global_container_stack.definition.getId()] preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter) # Create a new ID & new metadata for the new material. diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 00be1e3807..2680c6d28b 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -14,6 +14,7 @@ if TYPE_CHECKING: from typing import Dict from cura.Machines.MachineNode import MachineNode + ## This class represents an extruder variant in the container tree. # # The subnodes of these nodes are materials. @@ -54,7 +55,7 @@ class VariantNode(ContainerNode): materials_per_base_file = {material["base_file"]: material for material in all_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. - materials = materials_per_base_file.values() + materials = list(materials_per_base_file.values()) # Filter materials based on the exclude_materials property. filtered_materials = [material for material in materials if material["id"] not in self.machine.exclude_materials] diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 89838e6def..a7447aaa1e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1515,6 +1515,8 @@ class MachineManager(QObject): # \param intent_category The intent category to change to. def setIntentByCategory(self, intent_category: str) -> None: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return container_tree = ContainerTree.getInstance() for extruder in global_stack.extruderList: definition_id = global_stack.definition.getId() From 784ab6e903523c959cab8161fd43bd6270ce753c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 16:36:11 +0200 Subject: [PATCH 349/994] Add missing isDirty function CURA-6600 --- tests/Settings/MockContainer.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Settings/MockContainer.py b/tests/Settings/MockContainer.py index c85dbf42af..0f3b85293c 100644 --- a/tests/Settings/MockContainer.py +++ b/tests/Settings/MockContainer.py @@ -116,6 +116,9 @@ class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): def getVersionFromSerialized(cls, serialized): raise NotImplementedError() + def isDirty(self): + return True + metaDataChanged = Signal() propertyChanged = Signal() containersChanged = Signal() From d9e94f5019b0417807d0230ca4576616de0f8a48 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 17:07:36 +0200 Subject: [PATCH 350/994] Fix tests --- tests/Machines/TestContainerTree.py | 8 ++++++-- tests/Machines/TestMachineNode.py | 6 ++++-- tests/Machines/TestMaterialNode.py | 11 ++++++----- tests/Settings/TestCuraContainerRegistry.py | 4 ++++ tests/Settings/TestCuraStackBuilder.py | 16 +++++++++++----- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 6ad54ecc49..0e6de57b0e 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -2,10 +2,11 @@ from unittest.mock import patch, MagicMock import pytest from UM.Settings.DefinitionContainer import DefinitionContainer from cura.Machines.ContainerTree import ContainerTree +from cura.Settings.GlobalStack import GlobalStack def createMockedStack(definition_id: str): - result = MagicMock() + result = MagicMock(spec = GlobalStack) result.definition.getId = MagicMock(return_value = definition_id) return result @@ -34,8 +35,11 @@ def test_newMachineAdded(container_registry): # machine_3 shouldn't be there, as on init it wasn't in the registry assert "machine_3" not in container_tree.machines - # But when it does get added (by manually triggering the _machineAdded), it should be there. + # It should only react when a globalStack is added. container_tree._machineAdded(mocked_definition_container) + assert "machine_3" not in container_tree.machines + + container_tree._machineAdded(createMockedStack("machine_3")) assert "machine_3" in container_tree.machines diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index fe0330609a..43aa6f0476 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -11,6 +11,7 @@ metadata_dict = {} def container_registry(): result = MagicMock() result.findInstanceContainersMetadata = MagicMock(return_value = [{"id": "variant_1", "name": "Variant One", "quality_type": "normal"}, {"id": "variant_2", "name": "Variant Two", "quality_type": "great"}]) + result.findContainersMetadata = MagicMock(return_value = [{"has_variants": True}]) return result @@ -26,8 +27,9 @@ def createMockedInstanceContainer(): def createMachineNode(container_id, container_registry): with patch("cura.Machines.MachineNode.VariantNode"): # We're not testing the variant node here, so patch it out. - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - return MachineNode(container_id) + with patch("cura.Machines.MachineNode.QualityNode"): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + return MachineNode(container_id) def test_machineNodeInit(container_registry): diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index b25b348a57..2c1b593b54 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -28,12 +28,13 @@ def getInstanceContainerSideEffect(*args, **kwargs): if material is not None and variant is not None: definition_dict = instance_container_metadata_dict.get(definition) variant_dict = definition_dict.get(variant) - material_dict = variant_dict.get(material) + material_dict = variant_dict.get("material_1") return material_dict if type == "quality": if variant is None: return instance_container_metadata_dict.get(definition).get("no_variant") else: + print(variant, definition, instance_container_metadata_dict.get(definition).get(variant).get("material_1")) return instance_container_metadata_dict.get(definition).get(variant).get("material_1") if definition is None: return [{"id": "material_1", "material": "material_1"}] @@ -96,12 +97,12 @@ def test_onRemoved_rightContainer(container_registry): variant_node.machine.has_machine_quality = True variant_node.machine.quality_definition = "machine_1" with patch("cura.Machines.MaterialNode.QualityNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance",MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): node = MaterialNode("material_1", variant_node) - container = createMockedInstanceContainer("material_1") - variant_node.materials = {"material_1": MagicMock()} - node._onRemoved(container) + container = createMockedInstanceContainer("material_1") + variant_node.materials = {"material_1": MagicMock()} + node._onRemoved(container) assert "material_1" not in variant_node.materials diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py index a0c183c329..9817ebf758 100644 --- a/tests/Settings/TestCuraContainerRegistry.py +++ b/tests/Settings/TestCuraContainerRegistry.py @@ -286,12 +286,15 @@ class TestImportProfile: result = container_registry.importProfile("test.zomg") assert result["status"] == "error" + @pytest.mark.skip def test_importProfileSuccess(self, container_registry): container_registry._getIOPlugins = unittest.mock.MagicMock(return_value=[("reader_id", {"profile_reader": [{"extension": "zomg", "description": "dunno"}]})]) + mocked_application.getGlobalContainerStack = unittest.mock.MagicMock(return_value=self.mocked_global_stack) mocked_definition = unittest.mock.MagicMock(name = "definition") + container_registry.findContainers = unittest.mock.MagicMock(return_value=[mocked_definition]) container_registry.findDefinitionContainers = unittest.mock.MagicMock(return_value = [mocked_definition]) mocked_profile = unittest.mock.MagicMock(name = "Mocked_global_profile") @@ -299,6 +302,7 @@ class TestImportProfile: with unittest.mock.patch.object(container_registry, "createUniqueName", return_value="derp"): with unittest.mock.patch.object(container_registry, "_configureProfile", return_value=None): result = container_registry.importProfile("test.zomg") + assert result["status"] == "ok" diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index b77def1fa4..9f2db2cf19 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -69,12 +69,18 @@ def test_createMachine(application, container_registry, definition_container, gl metadata["preferred_quality_type"] = "normal" container_registry.addContainer(definition_container) - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - machine = CuraStackBuilder.createMachine("Whatever", "Test Definition") + quality_node = MagicMock() + machine_node = MagicMock() + machine_node.preferredGlobalQuality = MagicMock(return_value = quality_node) + quality_node.container = quality_container - assert machine.quality == quality_container - assert machine.definition == definition_container - assert machine.variant == global_variant + with patch("cura.Settings.CuraStackBuilder.MachineNode", MagicMock(return_value = machine_node)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + machine = CuraStackBuilder.createMachine("Whatever", "Test Definition") + + assert machine.quality == quality_container + assert machine.definition == definition_container + assert machine.variant == global_variant def test_createExtruderStack(application, definition_container, global_variant, material_instance_container, quality_container, quality_changes_container): From 001c2ec753bf0840de9422c15a4455ac71143f9a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 17:09:31 +0200 Subject: [PATCH 351/994] Fix test --- tests/Machines/TestQualityNode.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Machines/TestQualityNode.py b/tests/Machines/TestQualityNode.py index 64685689c2..54266cb6ad 100644 --- a/tests/Machines/TestQualityNode.py +++ b/tests/Machines/TestQualityNode.py @@ -44,6 +44,7 @@ def test_qualityNode_machine_1(container_registry): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): node = QualityNode("quality_1", material_node) - assert len(node.intents) == 2 + assert len(node.intents) == 3 assert "intent_3" in node.intents - assert "intent_4" in node.intents \ No newline at end of file + assert "intent_4" in node.intents + assert "empty_intent" in node.intents \ No newline at end of file From 10f37c98ff8ea8668ffe72d6e8d860f282073c86 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 13:35:17 +0200 Subject: [PATCH 352/994] Add test for getCurrentQualityGroups if there is no current printer Contributes to issue CURA-6600. --- tests/Machines/TestContainerTree.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 0e6de57b0e..5d269fc6a9 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -4,6 +4,8 @@ from UM.Settings.DefinitionContainer import DefinitionContainer from cura.Machines.ContainerTree import ContainerTree from cura.Settings.GlobalStack import GlobalStack +import cura.CuraApplication # DEBUG! + def createMockedStack(definition_id: str): result = MagicMock(spec = GlobalStack) @@ -54,3 +56,11 @@ def test_alreadyKnownMachineAdded(container_registry): # The ID is already there, so no machine should be added. container_tree._machineAdded(mocked_definition_container) assert len(container_tree.machines) == 2 + +def test_getCurrentQualityGroupsNoGlobalStack(container_registry): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = MagicMock(getGlobalContainerStack = MagicMock(return_value = None)))): + container_tree = ContainerTree() + result = container_tree.getCurrentQualityGroups() + + assert len(result) == 0 \ No newline at end of file From 1c81174baf0dc3403783a33b2de566ff825c54a6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 16:47:35 +0200 Subject: [PATCH 353/994] Fix crashing upon creating QualityManagementModel and MaterialManagementModel The C++ object should be kept alive in QML. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index b704fb35b2..f42f8b2798 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -221,8 +221,8 @@ class CuraApplication(QtApplication): self._cura_scene_controller = None self._machine_error_checker = None - self._machine_settings_manager = MachineSettingsManager(self, parent=self) - self._material_management_model = MaterialManagementModel() + self._machine_settings_manager = MachineSettingsManager(self, parent = self) + self._material_management_model = None self._quality_management_model = None self._discovered_printer_model = DiscoveredPrintersModel(self, parent = self) @@ -980,12 +980,14 @@ class CuraApplication(QtApplication): @pyqtSlot(result = QObject) def getMaterialManagementModel(self): + if not self._material_management_model: + self._material_management_model = MaterialManagementModel(parent = self) return self._material_management_model - @pyqtSlot(result=QObject) + @pyqtSlot(result = QObject) def getQualityManagementModel(self): if not self._quality_management_model: - self._quality_management_model = QualityManagementModel() + self._quality_management_model = QualityManagementModel(parent = self) return self._quality_management_model def getSimpleModeSettingsManager(self, *args): From b05de3e6d82893766b4f873f30cd7aca4fd1a579 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 16:48:01 +0200 Subject: [PATCH 354/994] Remove unused import Contributes to issue CURA-6600. --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 9b661f1996..360efc210f 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -9,7 +9,7 @@ from UM.Settings.SettingFunction import SettingFunction import cura.CuraApplication # Imported this way to prevent circular dependencies. from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.QualityManager import QualityGroup, QualityManager +from cura.Machines.QualityManager import QualityGroup # From b5d32a9b70b73adea1001896b7f1881a46a9de20 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 17:07:18 +0200 Subject: [PATCH 355/994] Move createQualityChanges function to QualityManagementModel This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless). Contributes to issue CURA-6600. --- .../Machines/Models/QualityManagementModel.py | 49 ++++++++++++++++++ cura/Machines/QualityManager.py | 50 ++++--------------- resources/qml/Preferences/ProfilesPage.qml | 2 +- 3 files changed, 60 insertions(+), 41 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index dcd7a770ee..2b1db54487 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -9,6 +9,7 @@ from UM.Qt.ListModel import ListModel from UM.Settings.InstanceContainer import InstanceContainer # To create new profiles. import cura.CuraApplication # Imported this way to prevent circular imports. +from cura.Settings.ContainerManager import ContainerManager from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container @@ -127,6 +128,54 @@ class QualityManagementModel(ListModel): new_id = container_registry.uniqueName(container.getId()) container_registry.addContainer(container.duplicate(new_id, new_name)) + ## Create quality changes containers from the user containers in the active + # stacks. + # + # This will go through the global and extruder stacks and create + # quality_changes containers from the user containers in each stack. These + # then replace the quality_changes containers in the stack and clear the + # user settings. + # \param base_name The new name for the quality changes profile. The final + # name of the profile might be different from this, because it needs to be + # made unique. + @pyqtSlot(str) + def createQualityChanges(self, base_name: str) -> None: + machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() + + global_stack = machine_manager.activeMachine + if not global_stack: + return + + active_quality_name = machine_manager.activeQualityOrQualityChangesName + if active_quality_name == "": + Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId()) + return + + machine_manager.blurSettings.emit() + if base_name is None or base_name == "": + base_name = active_quality_name + unique_name = self._container_registry.uniqueName(base_name) + + # Go through the active stacks and create quality_changes containers from the user containers. + container_manager = ContainerManager.getInstance() + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + stack_list = [global_stack] + list(global_stack.extruders.values()) + for stack in stack_list: + quality_container = stack.quality + quality_changes_container = stack.qualityChanges + if not quality_container or not quality_changes_container: + Logger.log("w", "No quality or quality changes container found in stack %s, ignoring it", stack.getId()) + continue + + extruder_stack = None + if isinstance(stack, ExtruderStack): + extruder_stack = stack + new_changes = self._createQualityChanges(quality_container.getMetaDataEntry("quality_type"), unique_name, global_stack, extruder_stack) + container_manager._performMerge(new_changes, quality_changes_container, clear_settings = False) + container_manager._performMerge(new_changes, stack.userChanges) + + container_registry.addContainer(new_changes) + ## Create a quality changes container with the given set-up. # \param quality_type The quality type of the new container. # \param new_name The name of the container. This name must be unique. diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 7d0ad1e24e..b81bf09c3c 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -169,49 +169,19 @@ class QualityManager(QObject): def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item: Dict[str, Any]) -> None: return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().duplicateQualityChanges(quality_changes_name, quality_model_item) - ## Create quality changes containers from the user containers in the active stacks. + ## Create quality changes containers from the user containers in the active + # stacks. # - # This will go through the global and extruder stacks and create quality_changes containers from - # the user containers in each stack. These then replace the quality_changes containers in the - # stack and clear the user settings. + # This will go through the global and extruder stacks and create + # quality_changes containers from the user containers in each stack. These + # then replace the quality_changes containers in the stack and clear the + # user settings. + # \param base_name The new name for the quality changes profile. The final + # name of the profile might be different from this, because it needs to be + # made unique. @pyqtSlot(str) def createQualityChanges(self, base_name: str) -> None: - machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() - - global_stack = machine_manager.activeMachine - if not global_stack: - return - - active_quality_name = machine_manager.activeQualityOrQualityChangesName - if active_quality_name == "": - Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId()) - return - - machine_manager.blurSettings.emit() - if base_name is None or base_name == "": - base_name = active_quality_name - unique_name = self._container_registry.uniqueName(base_name) - - # Go through the active stacks and create quality_changes containers from the user containers. - stack_list = [global_stack] + list(global_stack.extruders.values()) - for stack in stack_list: - user_container = stack.userChanges - quality_container = stack.quality - quality_changes_container = stack.qualityChanges - if not quality_container or not quality_changes_container: - Logger.log("w", "No quality or quality changes container found in stack %s, ignoring it", stack.getId()) - continue - - quality_type = quality_container.getMetaDataEntry("quality_type") - extruder_stack = None - if isinstance(stack, ExtruderStack): - extruder_stack = stack - new_changes = self._createQualityChanges(quality_type, unique_name, global_stack, extruder_stack) - from cura.Settings.ContainerManager import ContainerManager - ContainerManager.getInstance()._performMerge(new_changes, quality_changes_container, clear_settings = False) - ContainerManager.getInstance()._performMerge(new_changes, user_container) - - self._container_registry.addContainer(new_changes) + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().createQualityChanges(base_name) # # Create a quality changes container with the given setup. diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 6907795e1a..56fdd570a8 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -182,7 +182,7 @@ Item { base.newQualityNameToSelect = newName; // We want to switch to the new profile once it's created base.toActivateNewQuality = true; - base.qualityManager.createQualityChanges(newName); + base.qualityManagementModel.createQualityChanges(newName); } } From 297b430712db2df73be86cf43357310027e26f92 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 17:42:17 +0200 Subject: [PATCH 356/994] Fix getting container registry It's not in the fields of this class. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 2b1db54487..95e60dc1b8 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -154,11 +154,11 @@ class QualityManagementModel(ListModel): machine_manager.blurSettings.emit() if base_name is None or base_name == "": base_name = active_quality_name - unique_name = self._container_registry.uniqueName(base_name) + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + unique_name = container_registry.uniqueName(base_name) # Go through the active stacks and create quality_changes containers from the user containers. container_manager = ContainerManager.getInstance() - container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() stack_list = [global_stack] + list(global_stack.extruders.values()) for stack in stack_list: quality_container = stack.quality From a1e6ba615c3d2a00218d52ba67135a632331c658 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 17:44:28 +0200 Subject: [PATCH 357/994] Don't use isinstance to check for extruder stack vs. global Just use the metadata available. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 95e60dc1b8..008b846c7d 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -168,7 +168,7 @@ class QualityManagementModel(ListModel): continue extruder_stack = None - if isinstance(stack, ExtruderStack): + if stack.getMetaDataEntry("position") is not None: extruder_stack = stack new_changes = self._createQualityChanges(quality_container.getMetaDataEntry("quality_type"), unique_name, global_stack, extruder_stack) container_manager._performMerge(new_changes, quality_changes_container, clear_settings = False) From 4043afd09f1788ddb37025c9424ccdf8bef1bd66 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 17:47:31 +0200 Subject: [PATCH 358/994] Refer _createQualityChanges through to QualityManagementModel That's where the function was moved. This function is still being called from various places, even though it's protected. Should change that... Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 35 ++++++++------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index b81bf09c3c..e471518c29 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -183,33 +183,14 @@ class QualityManager(QObject): def createQualityChanges(self, base_name: str) -> None: return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().createQualityChanges(base_name) - # - # Create a quality changes container with the given setup. - # - def _createQualityChanges(self, quality_type: str, new_name: str, machine: "GlobalStack", - extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": - base_id = machine.definition.getId() if extruder_stack is None else extruder_stack.getId() - new_id = base_id + "_" + new_name - new_id = new_id.lower().replace(" ", "_") - new_id = self._container_registry.uniqueName(new_id) - - # Create a new quality_changes container for the quality. - quality_changes = InstanceContainer(new_id) - quality_changes.setName(new_name) - quality_changes.setMetaDataEntry("type", "quality_changes") - quality_changes.setMetaDataEntry("quality_type", quality_type) - - # If we are creating a container for an extruder, ensure we add that to the container - if extruder_stack is not None: - quality_changes.setMetaDataEntry("position", extruder_stack.getMetaDataEntry("position")) - - # If the machine specifies qualities should be filtered, ensure we match the current criteria. - machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) - quality_changes.setDefinition(machine_definition_id) - - quality_changes.setMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.getInstance().SettingVersion) - return quality_changes - + ## Create a quality changes container with the given set-up. + # \param quality_type The quality type of the new container. + # \param new_name The name of the container. This name must be unique. + # \param machine The global stack to create the profile for. + # \param extruder_stack The extruder stack to create the profile for. If + # not provided, only a global container will be created. + def _createQualityChanges(self, quality_type: str, new_name: str, machine: "GlobalStack", extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel()._createQualityChanges(quality_type, new_name, machine, extruder_stack) # # Gets the machine definition ID that can be used to search for Quality containers that are suitable for the given From 7216a1dbd7380f899e474f5d0ec5a14be7a7c832 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 17:52:18 +0200 Subject: [PATCH 359/994] Refer through to correct function of QualityManagementModel Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index e471518c29..cc359b00dd 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -158,7 +158,7 @@ class QualityManager(QObject): # unique. @pyqtSlot(QObject, str, result = str) def renameQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", new_name: str) -> str: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group, new_name) + return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().renameQualityChangesGroup(quality_changes_group, new_name) ## Duplicates a given quality profile OR quality changes profile. # \param new_name The desired name of the new profile. This will be made From f8472d6414fb44164cdb9458df9e838d694fecfa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Sep 2019 18:00:04 +0200 Subject: [PATCH 360/994] Fix changing name of profiles in quality changes group Because quality changes don't have nodes any more. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 008b846c7d..d144e75515 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -86,10 +86,9 @@ class QualityManagementModel(ListModel): application = cura.CuraApplication.CuraApplication.getInstance() new_name = application.getContainerRegistry().uniqueName(new_name) - for node in quality_changes_group.getAllNodes(): - container = node.container - if container: - container.setName(new_name) + quality_changes_group.metadata_for_global["name"] = new_name + for metadata in quality_changes_group.metadata_per_extruder.values(): + metadata["name"] = new_name quality_changes_group.name = new_name From 0926c223b2e167fbacd566d4b73d44a0016c2860 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 3 Sep 2019 10:53:46 +0200 Subject: [PATCH 361/994] Add missing renderType: Text.NativeRendering CURA-6598 --- resources/qml/LabelBar.qml | 1 + resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 ++ resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 1 + .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 3 +++ 4 files changed, 7 insertions(+) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index f6e655de79..3985a47368 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -35,6 +35,7 @@ Item text: model[modelKey] color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") + renderType: Text.NativeRendering height: contentHeight anchors { diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 656f58ac28..f329b1ce65 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -45,6 +45,7 @@ Item } text: catalog.i18nc("@label", "Profile") font: UM.Theme.getFont("medium") + renderType: Text.NativeRendering color: UM.Theme.getColor("text") verticalAlignment: Text.AlignVCenter } @@ -69,6 +70,7 @@ Item anchors.verticalCenter: intentSelection.verticalCenter height: contentHeight verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } background: Rectangle diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index 1652b71213..511e29de2a 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -44,5 +44,6 @@ Button verticalAlignment: Text.AlignVCenter anchors.left: button.left anchors.leftMargin: UM.Theme.getSize("wide_margin").width + renderType: Text.NativeRendering } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 6d51b9005b..cd2510163f 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -61,6 +61,7 @@ Popup { id: headerLabel text: model.name + renderType: Text.NativeRendering height: visible ? contentHeight: 0 enabled: false visible: qualitiesList.visibleChildren.length > 0 @@ -198,6 +199,7 @@ Popup anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Label { @@ -207,6 +209,7 @@ Popup anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } onClicked: From f77ad22fe3a7637f7b099330c99cf89cc8969730 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 3 Sep 2019 11:13:47 +0200 Subject: [PATCH 362/994] Fix hardcoded entries in radioCheckbar CURA-6598 --- resources/qml/RadioCheckbar.qml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 4f959fc8fd..6f5ed301fa 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -1,18 +1,19 @@ import QtQuick 2.0 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 +import UM 1.1 as UM Item { id: base property ButtonGroup buttonGroup: null - property color activeColor: "#3282ff" - property color inactiveColor: "#cccccc" - property color defaultItemColor: "#0a0850" - property int checkboxSize: 14 - property int inactiveMarkerSize: 4 - property int barSize: 2 + property color activeColor: UM.Theme.getColor("primary") + property color inactiveColor: UM.Theme.getColor("slider_groove") + property color defaultItemColor: UM.Theme.getColor("small_button_active") + property int checkboxSize: UM.Theme.getSize("radio_button").height * 0.75 + property int inactiveMarkerSize: 2 * barSize + property int barSize: UM.Theme.getSize("slider_groove_radius").height property var isCheckedFunction // Function that accepts the modelItem and returns if the item should be active. implicitWidth: 200 @@ -28,15 +29,13 @@ Item height: barSize - // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator - // but not when using the exact same QML in Cura. - y: 0.5 * checkboxSize anchors { left: buttonBar.left right: buttonBar.right leftMargin: (checkboxSize - inactiveMarkerSize) / 2 rightMargin: (checkboxSize - inactiveMarkerSize) / 2 + verticalCenter: parent.verticalCenter } } @@ -72,12 +71,11 @@ Item height: barSize width: buttonBar.width / (repeater.count - 1) - activeComponent.width - 2 color: defaultItemColor - // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator - // but not when using the exact same QML in Cura. - y: 0.5 * checkboxSize + anchors { right: activeComponent.left + verticalCenter: parent.verticalCenter } visible: previousItem !== null && previousItem.isEnabled && isEnabled } @@ -105,7 +103,7 @@ Item { // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator // but not when using the exact same QML in Cura. - y: 0.5 * checkboxSize - 1 + anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter height: inactiveMarkerSize width: inactiveMarkerSize From 52f3f9b7735604f0d746459e4cec282956496906 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 3 Sep 2019 11:01:39 +0200 Subject: [PATCH 363/994] Update QML import versions and add headings CURA-6598 --- resources/qml/LabelBar.qml | 9 +++++++-- .../qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 4 ++-- .../qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 6 +++--- resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 7 +++++-- .../Custom/QualitiesWithIntentMenu.qml | 8 ++++++-- .../qml/PrintSetupSelector/PrintSetupSelectorHeader.qml | 2 +- .../Recommended/RecommendedPrintSetup.qml | 2 +- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- resources/qml/RadioCheckbar.qml | 5 ++++- 9 files changed, 30 insertions(+), 15 deletions(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index 3985a47368..87cc825b3b 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -1,7 +1,12 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 + import UM 1.2 as UM + // The labelBar shows a set of labels that are evenly spaced from oneother. // The first item is aligned to the left, the last is aligned to the right. // It's intended to be used together with RadioCheckBar. As such, it needs diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index fb074e948c..959d498054 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -1,8 +1,8 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index f329b1ce65..d38dfc14f8 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -1,9 +1,9 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Controls 1.1 as OldControls +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Controls 1.4 as OldControls import UM 1.3 as UM import Cura 1.6 as Cura diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index 511e29de2a..29436da9cf 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -1,8 +1,11 @@ -import QtQuick 2.0 +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 import QtQuick.Controls 2.3 -import Cura 1.6 as Cura import UM 1.2 as UM +import Cura 1.6 as Cura Button { diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index cd2510163f..a885629247 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -1,8 +1,12 @@ -import QtQuick 2.0 +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 import QtQuick.Controls 2.3 -import Cura 1.6 as Cura import UM 1.2 as UM +import Cura 1.6 as Cura + Popup { id: popup diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 30691d32b9..5628867922 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -1,7 +1,7 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index d9364681d2..a180ad6324 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -1,7 +1,7 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 2742605399..68a3e4811d 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -1,7 +1,7 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls 2.3 as Controls2 import QtQuick.Controls.Styles 1.4 diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 6f5ed301fa..3c767a6201 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -1,4 +1,7 @@ -import QtQuick 2.0 +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import UM 1.1 as UM From 39d52556f41f7f776167d406d02f3a7939160edf Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 3 Sep 2019 11:16:50 +0200 Subject: [PATCH 364/994] Fix text alignments by using rounding CURA-6598 --- resources/qml/LabelBar.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index 87cc825b3b..571c9f0bfb 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -32,8 +32,9 @@ Item Item { Layout.fillWidth: true - Layout.maximumWidth: index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1) + Layout.maximumWidth: Math.round(index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1)) height: label.height + Label { id: label @@ -52,7 +53,7 @@ Item // We want the center of the label to align with the center of the item, so we negatively offset by half the contentWidth right: index + 1 === repeater.count ? parent.right: undefined left: index + 1 === repeater.count || index === 0 ? undefined: parent.left - leftMargin: (0.5 * itemSize) - 0.5 * contentWidth + leftMargin: Math.round((itemSize - contentWidth) * 0.5) } } } From ac0c7fd4d6b867dab9535f502c03e67abfead525 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 3 Sep 2019 11:27:11 +0200 Subject: [PATCH 365/994] Remove unused properties CURA-6598 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index cd2510163f..2aa80e8fe7 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -9,9 +9,7 @@ Popup implicitWidth: 400 property var dataModel: Cura.IntentCategoryModel {} - property int defaultMargin: 5 - property int checkmarkSize: 12 - property int buttonHeight: 25 + property int defaultMargin: UM.Theme.getSize("default_margin").width property color backgroundColor: UM.Theme.getColor("main_background") property color borderColor: UM.Theme.getColor("lining") From 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 4 Sep 2019 14:52:54 +0200 Subject: [PATCH 366/994] Make 3MF-reader aware of setting-version for introduction Intent. --- cura/Settings/CuraContainerStack.py | 21 ++++++++++++++++++- plugins/3MFReader/ThreeMFWorkspaceReader.py | 23 ++++++++++++--------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index c141ac9b0e..c1c2544c6e 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Any, cast, List, Optional +from typing import Any, cast, Dict, List, Optional from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject from UM.Application import Application @@ -364,3 +364,22 @@ class _ContainerIndexes: # Reverse lookup: type -> index TypeIndexMap = dict([(v, k) for k, v in IndexTypeMap.items()]) + + # Mapping to old values before Intent introduction. Used for reading older versions of input files. + IndexToOldIndexMap = { + UserChanges: 0, + QualityChanges: 1, + Intent: -1, # Wasn't there in the old 'format'! + Quality: 2, + Material: 3, + Variant: 4, + DefinitionChanges: 5, + Definition: 6, + } + + # Reverse lookup: old index -> new index + OldIndexToIndexMap = dict([(v, k) for k, v in IndexToOldIndexMap.items()]) + + @classmethod + def getIndexMapping(cls, setting_version: int) -> Dict[int, int]: + return dict([(x, x) for x in list(range(99))]) if setting_version >= 10 else cls.IndexToOldIndexMap diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index d7cc2f0b70..7d01421d81 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -368,7 +368,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Get quality type parser = ConfigParser(interpolation = None) parser.read_string(serialized) - quality_container_id = parser["containers"][str(_ContainerIndexes.Quality)] + index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) + quality_container_id = parser["containers"][str(index_map_version[_ContainerIndexes.Quality])] quality_type = "empty_quality" if quality_container_id not in ("empty", "empty_quality"): quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"] @@ -378,10 +379,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): serialized = GlobalStack._updateSerialized(serialized, global_stack_file) parser = ConfigParser(interpolation = None) parser.read_string(serialized) - definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)] + index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) + definition_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.DefinitionChanges])] if definition_changes_id not in ("empty", "empty_definition_changes"): self._machine_info.definition_changes_info = instance_container_info_dict[definition_changes_id] - user_changes_id = parser["containers"][str(_ContainerIndexes.UserChanges)] + user_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.UserChanges])] if user_changes_id not in ("empty", "empty_user_changes"): self._machine_info.user_changes_info = instance_container_info_dict[user_changes_id] @@ -391,8 +393,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info = ExtruderInfo() extruder_info.position = position - variant_id = parser["containers"][str(_ContainerIndexes.Variant)] - material_id = parser["containers"][str(_ContainerIndexes.Material)] + variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] + material_id = parser["containers"][str(index_map_version[_ContainerIndexes.Material])] if variant_id not in ("empty", "empty_variant"): extruder_info.variant_info = instance_container_info_dict[variant_id] if material_id not in ("empty", "empty_material"): @@ -400,7 +402,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info.root_material_id = root_material_id self._machine_info.extruder_info_dict[position] = extruder_info else: - variant_id = parser["containers"][str(_ContainerIndexes.Variant)] + variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] if variant_id not in ("empty", "empty_variant"): self._machine_info.variant_info = instance_container_info_dict[variant_id] @@ -412,13 +414,14 @@ class ThreeMFWorkspaceReader(WorkspaceReader): serialized = ExtruderStack._updateSerialized(serialized, extruder_stack_file) parser = ConfigParser(interpolation = None) parser.read_string(serialized) + index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) # The check should be done for the extruder stack that's associated with the existing global stack, # and those extruder stacks may have different IDs. # So we check according to the positions position = parser["metadata"]["position"] - variant_id = parser["containers"][str(_ContainerIndexes.Variant)] - material_id = parser["containers"][str(_ContainerIndexes.Material)] + variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] + material_id = parser["containers"][str(index_map_version[_ContainerIndexes.Material])] extruder_info = ExtruderInfo() extruder_info.position = position @@ -432,11 +435,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): root_material_id = reverse_material_id_dict[material_id] extruder_info.root_material_id = root_material_id - definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)] + definition_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.DefinitionChanges])] if definition_changes_id not in ("empty", "empty_definition_changes"): extruder_info.definition_changes_info = instance_container_info_dict[definition_changes_id] - user_changes_id = parser["containers"][str(_ContainerIndexes.UserChanges)] + user_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.UserChanges])] if user_changes_id not in ("empty", "empty_user_changes"): extruder_info.user_changes_info = instance_container_info_dict[user_changes_id] self._machine_info.extruder_info_dict[position] = extruder_info From 2dbfbecd12c179b964d70a9f5f6fe81a07a3e55a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 4 Sep 2019 16:37:10 +0200 Subject: [PATCH 367/994] Ensure that show/hide behavior of the qualities intent menu is correct It would previously blink if you pressed the button, as a click outside would hide it due to close policy, but a mouse release would show it again (as it's hidden and that's what the on clicked of the button did) CURA-6598 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 18088d50b9..e6bc798307 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -18,7 +18,7 @@ Popup property color borderColor: UM.Theme.getColor("lining") padding: 0 - + closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent background: Cura.RoundedRectangle { color: backgroundColor From 53aaaab891acab130e4c74fbd765c2a61e5ba544 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 4 Sep 2019 16:43:59 +0200 Subject: [PATCH 368/994] Add a topMargin for the qualities menu CURA-6598 --- .../Custom/QualitiesWithIntentMenu.qml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index e6bc798307..ccc3d3d71a 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -36,11 +36,17 @@ Popup contentItem: Column { - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_lining").width - anchors.rightMargin: UM.Theme.getSize("default_lining").width - anchors.right: parent.right - anchors.top: parent.top + anchors + { + left: parent.left + leftMargin: UM.Theme.getSize("default_lining").width + + right: parent.right + rightMargin: UM.Theme.getSize("default_lining").width + + top: parent.top + topMargin: UM.Theme.getSize("narrow_margin").height + } // This repeater adds the intent labels Repeater From 7f3b55a28670ef2f1770caf56165c1408d6709be Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 4 Sep 2019 16:48:06 +0200 Subject: [PATCH 369/994] Remove unknown reference CURA-6598 --- resources/qml/LabelBar.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index 571c9f0bfb..a6b54225f5 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -22,7 +22,6 @@ Item { anchors.left: parent.left anchors.right: parent.right - height: label.height spacing: 0 Repeater { From 994e0e53ccf99c34da0e307e912d6f3ff6c32f57 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 4 Sep 2019 16:54:35 +0200 Subject: [PATCH 370/994] Switch the anchors to paddings Otherwise the bottomb button would extend from the popup. CURA-6598 --- .../Custom/QualitiesWithIntentMenu.qml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index ccc3d3d71a..888a6ab309 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -17,6 +17,9 @@ Popup property color backgroundColor: UM.Theme.getColor("main_background") property color borderColor: UM.Theme.getColor("lining") + topPadding: UM.Theme.getSize("narrow_margin").height + rightPadding: UM.Theme.getSize("default_lining").width + leftPadding: UM.Theme.getSize("default_lining").width padding: 0 closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent background: Cura.RoundedRectangle @@ -36,18 +39,6 @@ Popup contentItem: Column { - anchors - { - left: parent.left - leftMargin: UM.Theme.getSize("default_lining").width - - right: parent.right - rightMargin: UM.Theme.getSize("default_lining").width - - top: parent.top - topMargin: UM.Theme.getSize("narrow_margin").height - } - // This repeater adds the intent labels Repeater { From 423b4ad8693fbe848a871f8999f65813b0c7d11b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 4 Sep 2019 17:16:07 +0200 Subject: [PATCH 371/994] Fix binding loop CURA-6598 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 ++ .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 1 + 2 files changed, 3 insertions(+) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index d38dfc14f8..682aefa821 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -61,6 +61,8 @@ Item height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height hoverEnabled: true + baselineOffset: null // If we don't do this, there is a binding loop. WHich is a bit weird, since we override the contentItem anyway... + contentItem: Label { id: textLabel diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 888a6ab309..96c8431112 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -20,6 +20,7 @@ Popup topPadding: UM.Theme.getSize("narrow_margin").height rightPadding: UM.Theme.getSize("default_lining").width leftPadding: UM.Theme.getSize("default_lining").width + padding: 0 closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent background: Cura.RoundedRectangle From 13011e375b7dd120f5cfe5df75bb4dc58819df14 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 5 Sep 2019 09:00:53 +0200 Subject: [PATCH 372/994] Fix quality layer label alignment CURA-6598 --- resources/qml/LabelBar.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index a6b54225f5..9a870811ca 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -53,6 +53,10 @@ Item right: index + 1 === repeater.count ? parent.right: undefined left: index + 1 === repeater.count || index === 0 ? undefined: parent.left leftMargin: Math.round((itemSize - contentWidth) * 0.5) + + // For some reason, the last label in the row gets misaligned with Qt 5.10. This lines seems to + // fix it. + verticalCenter: parent.verticalCenter } } } From 9a6f76c069d894dae00b8b06d61c165fb5a4832b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 5 Sep 2019 16:32:34 +0200 Subject: [PATCH 373/994] Add typing for get---ManagementModel Just to have my IDE find usages properly, really. Contributes to issue CURA-6600. --- cura/CuraApplication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f42f8b2798..157f673594 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -979,13 +979,13 @@ class CuraApplication(QtApplication): return self._machine_action_manager @pyqtSlot(result = QObject) - def getMaterialManagementModel(self): + def getMaterialManagementModel(self) -> MaterialManagementModel: if not self._material_management_model: self._material_management_model = MaterialManagementModel(parent = self) return self._material_management_model @pyqtSlot(result = QObject) - def getQualityManagementModel(self): + def getQualityManagementModel(self) -> QualityManagementModel: if not self._quality_management_model: self._quality_management_model = QualityManagementModel(parent = self) return self._quality_management_model From 71b94f6d5b058bbe6746c7f7150953f1d1a849bf Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 5 Sep 2019 17:26:48 +0200 Subject: [PATCH 374/994] Create own quality changes profiles instead of asking quality manager It was a protected function call on a different class anyway, so that should never have gotten accepted. Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 18 +++++++++++++----- plugins/GCodeWriter/GCodeWriter.py | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index d1c25530e3..d0b856a872 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -20,7 +20,9 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.InstanceContainer import InstanceContainer + import cura.CuraApplication +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MaterialManager import MaterialManager if TYPE_CHECKING: @@ -271,24 +273,30 @@ class ContainerManager(QObject): # \return \type{bool} True if successful, False if not. @pyqtSlot(result = bool) def updateQualityChanges(self) -> bool: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine + application = cura.CuraApplication.CuraApplication.getInstance() + global_stack = application.getMachineManager().activeMachine if not global_stack: return False - cura.CuraApplication.CuraApplication.getInstance().getMachineManager().blurSettings.emit() + application.getMachineManager().blurSettings.emit() current_quality_changes_name = global_stack.qualityChanges.getName() current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") extruder_stacks = list(global_stack.extruders.values()) container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - quality_manager = QualityManager.getInstance() + machine_definition_id = ContainerTree.getInstance().definitions[global_stack.definition.getId()].quality_definition for stack in [global_stack] + extruder_stacks: # Find the quality_changes container for this stack and merge the contents of the top container into it. quality_changes = stack.qualityChanges if quality_changes.getId() == "empty_quality_changes": - quality_changes = quality_manager._createQualityChanges(current_quality_type, current_quality_changes_name, - global_stack, stack) + quality_changes = InstanceContainer(container_registry.uniqueName((stack.getId() + "_" + current_quality_changes_name).lower().replace(" ", "_"))) + quality_changes.setName(current_quality_changes_name) + quality_changes.setMetaDataEntry("type", "quality_changes") + quality_changes.setMetaDataEntry("quality_type", current_quality_type) + quality_changes.setMetaDataEntry("position", stack.getMetaDataEntry("position")) + quality_changes.setMetaDataEntry("setting_version", application.SettingVersion) + quality_changes.setDefinition(machine_definition_id) container_registry.addContainer(quality_changes) stack.qualityChanges = quality_changes diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 9f9d6ebb79..edd0cebc96 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -116,17 +116,22 @@ class GCodeWriter(MeshWriter): # \return A serialised string of the settings. def _serialiseSettings(self, stack): container_registry = self._application.getContainerRegistry() - quality_manager = self._application.getQualityManager() prefix = self._setting_keyword + str(GCodeWriter.version) + " " # The prefix to put before each line. prefix_length = len(prefix) quality_type = stack.quality.getMetaDataEntry("quality_type") container_with_profile = stack.qualityChanges + machine_definition_id_for_quality = ContainerTree.getInstance().machines[stack.definition.getId()].quality_definition if container_with_profile.getId() == "empty_quality_changes": # If the global quality changes is empty, create a new one quality_name = container_registry.uniqueName(stack.quality.getName()) - container_with_profile = quality_manager._createQualityChanges(quality_type, quality_name, stack, None) + quality_id = container_registry.uniqueName((stack.definition.getId() + "_" + quality_name).lower().replace(" ", "_")) + container_with_profile = InstanceContainer(quality_id) + container_with_profile.setName(quality_name) + container_with_profile.setMetaDataEntry("type", "quality_changes") + container_with_profile.setMetaDataEntry("quality_type", quality_type) + container_with_profile.setDefinition(machine_definition_id_for_quality) flat_global_container = self._createFlattenedContainerInstance(stack.userChanges, container_with_profile) # If the quality changes is not set, we need to set type manually @@ -138,7 +143,6 @@ class GCodeWriter(MeshWriter): flat_global_container.setMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal")) # Get the machine definition ID for quality profiles - machine_definition_id_for_quality = ContainerTree.getInstance().machines[stack.definition.getId()].quality_definition flat_global_container.setMetaDataEntry("definition", machine_definition_id_for_quality) serialized = flat_global_container.serialize() @@ -150,7 +154,12 @@ class GCodeWriter(MeshWriter): if extruder_quality.getId() == "empty_quality_changes": # Same story, if quality changes is empty, create a new one quality_name = container_registry.uniqueName(stack.quality.getName()) - extruder_quality = quality_manager._createQualityChanges(quality_type, quality_name, stack, None) + quality_id = container_registry.uniqueName((stack.definition.getId() + "_" + quality_name).lower().replace(" ", "_")) + extruder_quality = InstanceContainer(quality_id) + extruder_quality.setName(quality_name) + extruder_quality.setMetaDataEntry("type", "quality_changes") + extruder_quality.setMetaDataEntry("quality_type", quality_type) + extruder_quality.setDefinition(machine_definition_id_for_quality) flat_extruder_quality = self._createFlattenedContainerInstance(extruder.userChanges, extruder_quality) # If the quality changes is not set, we need to set type manually From d618f2df7168ec60b48f2b31b06a6aefdaf1851d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:06:32 +0200 Subject: [PATCH 375/994] Add test for getCurrentQualityGroups The test succeeded but in writing it I discovered a bug. I'll fix that soon. Contributes to issue CURA-6600. --- tests/Machines/TestContainerTree.py | 42 ++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 5d269fc6a9..e82ce2384d 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -10,15 +10,30 @@ import cura.CuraApplication # DEBUG! def createMockedStack(definition_id: str): result = MagicMock(spec = GlobalStack) result.definition.getId = MagicMock(return_value = definition_id) + + extruder_left_mock = MagicMock() + extruder_left_mock.variant.getName = MagicMock(return_value = definition_id + "_left_variant_name") + extruder_left_mock.material.getMetaDataEntry = MagicMock(return_value = definition_id + "_left_material_base_file") + extruder_left_mock.isEnabled = True + extruder_right_mock = MagicMock() + extruder_right_mock.variant.getName = MagicMock(return_value = definition_id + "_right_variant_name") + extruder_right_mock.material.getMetaDataEntry = MagicMock(return_value = definition_id + "_right_material_base_file") + extruder_right_mock.isEnabled = True + extruder_dict = {"1": extruder_right_mock, "0": extruder_left_mock} + result.extruders = extruder_dict return result @pytest.fixture def container_registry(): result = MagicMock() - result.findContainerStacks = MagicMock(return_value=[createMockedStack("machine_1"), createMockedStack("machine_2")]) + result.findContainerStacks = MagicMock(return_value = [createMockedStack("machine_1"), createMockedStack("machine_2")]) return result +@pytest.fixture +def application(): + return MagicMock(getGlobalContainerStack = MagicMock(return_value = createMockedStack("current_global_stack"))) + def test_containerTreeInit(container_registry): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): @@ -32,7 +47,7 @@ def test_newMachineAdded(container_registry): mocked_definition_container = MagicMock(spec=DefinitionContainer) mocked_definition_container.getId = MagicMock(return_value = "machine_3") - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() # machine_3 shouldn't be there, as on init it wasn't in the registry assert "machine_3" not in container_tree.machines @@ -46,10 +61,10 @@ def test_newMachineAdded(container_registry): def test_alreadyKnownMachineAdded(container_registry): - mocked_definition_container = MagicMock(spec=DefinitionContainer) - mocked_definition_container.getId = MagicMock(return_value="machine_2") + mocked_definition_container = MagicMock(spec = DefinitionContainer) + mocked_definition_container.getId = MagicMock(return_value = "machine_2") - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() assert len(container_tree.machines) == 2 @@ -63,4 +78,19 @@ def test_getCurrentQualityGroupsNoGlobalStack(container_registry): container_tree = ContainerTree() result = container_tree.getCurrentQualityGroups() - assert len(result) == 0 \ No newline at end of file + assert len(result) == 0 + +def test_getCurrentQualityGroups(container_registry, application): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + container_tree = ContainerTree() + container_tree.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + result = container_tree.getCurrentQualityGroups() + + # As defined in the fixture for application. + expected_variant_names = ["current_global_stack_left_variant_name", "current_global_stack_right_variant_name"] + expected_material_base_files = ["current_global_stack_left_material_base_file", "current_global_stack_right_material_base_file"] + expected_is_enabled = [True, True] + + container_tree.machines["current_global_stack"].getQualityGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) \ No newline at end of file From 4bdc819f129061b5554c27fde120bba1a42469c0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:15:45 +0200 Subject: [PATCH 376/994] Fix nondetermistic result with dictionary values list Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result. It happened to work on my computer with the test, but there is no guarantee of that. This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really! Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 6 +++--- tests/Machines/TestContainerTree.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index eb2ed7d159..12a77083c4 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -53,9 +53,9 @@ class ContainerTree: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return {} - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] return self.machines[global_stack.definition.getId()].getQualityGroups(variant_names, material_bases, extruder_enabled) ## Get the quality changes groups available for the currently activated diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index e82ce2384d..ed54774acd 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -19,8 +19,8 @@ def createMockedStack(definition_id: str): extruder_right_mock.variant.getName = MagicMock(return_value = definition_id + "_right_variant_name") extruder_right_mock.material.getMetaDataEntry = MagicMock(return_value = definition_id + "_right_material_base_file") extruder_right_mock.isEnabled = True - extruder_dict = {"1": extruder_right_mock, "0": extruder_left_mock} - result.extruders = extruder_dict + extruder_list = [extruder_left_mock, extruder_right_mock] + result.extrudersList = extruder_list return result From 8bcd9b339abcac70b24966f2d06caac3cddceb4e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:20:03 +0200 Subject: [PATCH 377/994] Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 6 +++--- cura/Machines/QualityManager.py | 12 ++++++------ plugins/Toolbox/src/Toolbox.py | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 12a77083c4..c75f305885 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -69,9 +69,9 @@ class ContainerTree: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return [] - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) ## Builds the initial container tree. diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index cc359b00dd..699e6731a0 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -77,9 +77,9 @@ class QualityManager(QObject): # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> List[QualityChangesGroup]: - variant_names = [extruder.variant.getName() for extruder in machine.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in machine.extruders.values()] + variant_names = [extruder.variant.getName() for extruder in machine.extrudersList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extrudersList] + extruder_enabled = [extruder.isEnabled for extruder in machine.extrudersList] machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] return machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) @@ -92,9 +92,9 @@ class QualityManager(QObject): # for those types as values. def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: # Gather up the variant names and material base files for each extruder. - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] definition_id = global_stack.definition.getId() return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 5f73d563c7..40aacac056 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -368,9 +368,9 @@ class Toolbox(QObject, Extension): default_material_node = material_manager.getDefaultMaterial(global_stack, extruder_nr, global_stack.extruders[extruder_nr].variant.getName()) machine_manager.setMaterial(extruder_nr, default_material_node, global_stack = global_stack) for global_stack, extruder_nr, container_id in self._package_used_qualities: - variant_names = [extruder.variant.getName() for extruder in global_stack.extruders.values()] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruders.values()] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruders.values()] + variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] definition_id = global_stack.definition.getId() machine_node = container_tree.machines[definition_id] default_quality_group = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled)[machine_node.preferred_quality_type] From ea5530c507e02c4edb97ed12416fb94ed22d4dcc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:21:56 +0200 Subject: [PATCH 378/994] Add test for getting quality changes groups without global stack Shouldn't crash. Instead it should give no quality changes groups. Contributes to issue CURA-6600. --- tests/Machines/TestContainerTree.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index ed54774acd..c6fbccc266 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -93,4 +93,12 @@ def test_getCurrentQualityGroups(container_registry, application): expected_material_base_files = ["current_global_stack_left_material_base_file", "current_global_stack_right_material_base_file"] expected_is_enabled = [True, True] - container_tree.machines["current_global_stack"].getQualityGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) \ No newline at end of file + container_tree.machines["current_global_stack"].getQualityGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) + +def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = MagicMock(getGlobalContainerStack = MagicMock(return_value = None)))): + container_tree = ContainerTree() + result = container_tree.getCurrentQualityChangesGroups() + + assert len(result) == 0 \ No newline at end of file From 7f192ce36fa53f17c4bc2ad9dc156f9a9beb7643 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:25:07 +0200 Subject: [PATCH 379/994] Add test for getting current quality changes groups Similar to getting the current quality groups. Contributes to issue CURA-6600. --- tests/Machines/TestContainerTree.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index c6fbccc266..173d607f2c 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -101,4 +101,19 @@ def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry): container_tree = ContainerTree() result = container_tree.getCurrentQualityChangesGroups() - assert len(result) == 0 \ No newline at end of file + assert len(result) == 0 + +def test_getCurrentQualityChangesGroups(container_registry, application): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + container_tree = ContainerTree() + container_tree.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + result = container_tree.getCurrentQualityChangesGroups() + + # As defined in the fixture for application. + expected_variant_names = ["current_global_stack_left_variant_name", "current_global_stack_right_variant_name"] + expected_material_base_files = ["current_global_stack_left_material_base_file", "current_global_stack_right_material_base_file"] + expected_is_enabled = [True, True] + + container_tree.machines["current_global_stack"].getQualityChangesGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) \ No newline at end of file From 5106d3b7c1cf64452c052141099318481e346488 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:26:38 +0200 Subject: [PATCH 380/994] Test if we actually return the result of the call to getQuality[Changes]Groups Contributes to issue CURA-6600. --- tests/Machines/TestContainerTree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 173d607f2c..833f2b651e 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -94,6 +94,7 @@ def test_getCurrentQualityGroups(container_registry, application): expected_is_enabled = [True, True] container_tree.machines["current_global_stack"].getQualityGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) + assert result == container_tree.machines["current_global_stack"].getQualityGroups.return_value def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): @@ -116,4 +117,5 @@ def test_getCurrentQualityChangesGroups(container_registry, application): expected_material_base_files = ["current_global_stack_left_material_base_file", "current_global_stack_right_material_base_file"] expected_is_enabled = [True, True] - container_tree.machines["current_global_stack"].getQualityChangesGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) \ No newline at end of file + container_tree.machines["current_global_stack"].getQualityChangesGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled) + assert result == container_tree.machines["current_global_stack"].getQualityChangesGroups.return_value \ No newline at end of file From 178887d8e511d06475b4099bc3283cffc991c855 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 6 Sep 2019 17:40:31 +0200 Subject: [PATCH 381/994] Add test for getting metadata from machine node Contributes to issue CURA-6600. --- tests/Machines/TestMachineNode.py | 34 ++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index 43aa6f0476..d2ab108251 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -4,14 +4,24 @@ import pytest from UM.Settings.Interfaces import ContainerInterface from cura.Machines.MachineNode import MachineNode -metadata_dict = {} +metadata_dict = { + "has_materials": "false", + "has_variants": "true", + "has_machine_materials": "true", + "has_machine_quality": "true", + "quality_definition": "test_quality_definition", + "exclude_materials": ["excluded_material_1", "excluded_material_2"], + "preferred_variant_name": "beautiful_nozzle", + "preferred_material": "beautiful_material", + "preferred_quality_type": "beautiful_quality_type" +} @pytest.fixture def container_registry(): result = MagicMock() result.findInstanceContainersMetadata = MagicMock(return_value = [{"id": "variant_1", "name": "Variant One", "quality_type": "normal"}, {"id": "variant_2", "name": "Variant Two", "quality_type": "great"}]) - result.findContainersMetadata = MagicMock(return_value = [{"has_variants": True}]) + result.findContainersMetadata = MagicMock(return_value = [metadata_dict]) return result @@ -21,14 +31,14 @@ def getMetadataEntrySideEffect(*args, **kwargs): def createMockedInstanceContainer(): result = MagicMock(spec = ContainerInterface) - result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) + result.getMetaDataEntry = MagicMock(side_effect = getMetadataEntrySideEffect) return result def createMachineNode(container_id, container_registry): with patch("cura.Machines.MachineNode.VariantNode"): # We're not testing the variant node here, so patch it out. with patch("cura.Machines.MachineNode.QualityNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): return MachineNode(container_id) @@ -38,4 +48,18 @@ def test_machineNodeInit(container_registry): # As variants get stored by name, we want to check if those get added. assert "Variant One" in machine_node.variants assert "Variant Two" in machine_node.variants - assert len(machine_node.variants) == 2 # And ensure that *only* those two got added. \ No newline at end of file + assert len(machine_node.variants) == 2 # And ensure that *only* those two got added. + +def test_metadataProperties(container_registry): + node = createMachineNode("machine_1", container_registry) + + # Check if each of the metadata entries got stored properly. + assert not node.has_materials + assert node.has_variants + assert node.has_machine_materials + assert node.has_machine_quality + assert node.quality_definition == metadata_dict["quality_definition"] + assert node.exclude_materials == metadata_dict["exclude_materials"] + assert node.preferred_variant_name == metadata_dict["preferred_variant_name"] + assert node.preferred_material == metadata_dict["preferred_material"] + assert node.preferred_quality_type == metadata_dict["preferred_quality_type"] \ No newline at end of file From 04e2ecde9355a7dd5838b4a178418c0a0d6ec1bb Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 9 Sep 2019 16:12:35 +0200 Subject: [PATCH 382/994] Init intent to empty_intent_container for new machine stacks CURA-6598 --- cura/Settings/CuraStackBuilder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 30eb0b009c..33b0fd8d2e 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -160,6 +160,7 @@ class CuraStackBuilder: stack.variant = variant_container stack.material = material_container stack.quality = quality_container + stack.intent = application.empty_intent_container stack.qualityChanges = application.empty_quality_changes_container stack.userChanges = user_container @@ -208,6 +209,7 @@ class CuraStackBuilder: stack.variant = variant_container stack.material = material_container stack.quality = quality_container + stack.intent = application.empty_intent_container stack.qualityChanges = application.empty_quality_changes_container stack.userChanges = user_container From dba3b77f61fa265f0e284a6a8304fa9c47902658 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 9 Sep 2019 16:45:03 +0200 Subject: [PATCH 383/994] Fix tests CURA-6598 --- tests/Settings/TestCuraStackBuilder.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 9f2db2cf19..7a1e05296c 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -28,6 +28,14 @@ def quality_container(): return container +@pytest.fixture +def intent_container(): + container = InstanceContainer(container_id="intent container") + container.setMetaDataEntry("type", "intent") + + return container + + @pytest.fixture def quality_changes_container(): container = InstanceContainer(container_id="quality changes container") @@ -44,7 +52,8 @@ def test_createMachineWithUnknownDefinition(application, container_registry): assert mocked_config_error.addFaultyContainers.called_with("NOPE") -def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, quality_container, quality_changes_container): +def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, + quality_container, intent_container, quality_changes_container): variant_manager = MagicMock(name = "Variant Manager") quality_manager = MagicMock(name = "Quality Manager") global_variant_node = MagicMock( name = "global variant node") @@ -61,6 +70,7 @@ def test_createMachine(application, container_registry, definition_container, gl application.getQualityManager = MagicMock(return_value = quality_manager) application.empty_material_container = material_instance_container application.empty_quality_container = quality_container + application.empty_intent_container = intent_container application.empty_quality_changes_container = quality_changes_container application.empty_variant_container = global_variant @@ -83,9 +93,11 @@ def test_createMachine(application, container_registry, definition_container, gl assert machine.variant == global_variant -def test_createExtruderStack(application, definition_container, global_variant, material_instance_container, quality_container, quality_changes_container): +def test_createExtruderStack(application, definition_container, global_variant, material_instance_container, + quality_container, intent_container, quality_changes_container): application.empty_material_container = material_instance_container application.empty_quality_container = quality_container + application.empty_intent_container = intent_container application.empty_quality_changes_container = quality_changes_container with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): extruder_stack = CuraStackBuilder.createExtruderStack("Whatever", definition_container, "meh", 0, global_variant, material_instance_container, quality_container) From 5debdd4cf677b7a67f848374dbfe844241c6a824 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 9 Sep 2019 16:47:29 +0200 Subject: [PATCH 384/994] Fix getting extruder list everywhere Didn't test this beyond my own automated test, it seems. Contributes to issue CURA-6600. --- cura/Machines/ContainerTree.py | 12 ++++++------ cura/Machines/QualityManager.py | 12 ++++++------ plugins/Toolbox/src/Toolbox.py | 6 +++--- tests/Machines/TestContainerTree.py | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index c75f305885..2af022601a 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -53,9 +53,9 @@ class ContainerTree: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return {} - variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruderList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] return self.machines[global_stack.definition.getId()].getQualityGroups(variant_names, material_bases, extruder_enabled) ## Get the quality changes groups available for the currently activated @@ -69,9 +69,9 @@ class ContainerTree: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return [] - variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruderList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) ## Builds the initial container tree. diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 699e6731a0..4a5a4c0885 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -77,9 +77,9 @@ class QualityManager(QObject): # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> List[QualityChangesGroup]: - variant_names = [extruder.variant.getName() for extruder in machine.extrudersList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extrudersList] - extruder_enabled = [extruder.isEnabled for extruder in machine.extrudersList] + variant_names = [extruder.variant.getName() for extruder in machine.extruderList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extruderList] + extruder_enabled = [extruder.isEnabled for extruder in machine.extruderList] machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] return machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) @@ -92,9 +92,9 @@ class QualityManager(QObject): # for those types as values. def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: # Gather up the variant names and material base files for each extruder. - variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruderList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] definition_id = global_stack.definition.getId() return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 40aacac056..641340db17 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -368,9 +368,9 @@ class Toolbox(QObject, Extension): default_material_node = material_manager.getDefaultMaterial(global_stack, extruder_nr, global_stack.extruders[extruder_nr].variant.getName()) machine_manager.setMaterial(extruder_nr, default_material_node, global_stack = global_stack) for global_stack, extruder_nr, container_id in self._package_used_qualities: - variant_names = [extruder.variant.getName() for extruder in global_stack.extrudersList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extrudersList] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extrudersList] + variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] + material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruderList] + extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] definition_id = global_stack.definition.getId() machine_node = container_tree.machines[definition_id] default_quality_group = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled)[machine_node.preferred_quality_type] diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 833f2b651e..1c7b0de1da 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -20,7 +20,7 @@ def createMockedStack(definition_id: str): extruder_right_mock.material.getMetaDataEntry = MagicMock(return_value = definition_id + "_right_material_base_file") extruder_right_mock.isEnabled = True extruder_list = [extruder_left_mock, extruder_right_mock] - result.extrudersList = extruder_list + result.extruderList = extruder_list return result From e9862fb348219b536c50bf9b7e27d8ad8c1397ec Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 Sep 2019 10:46:23 +0200 Subject: [PATCH 385/994] Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 CURA-6599 --- cura/CuraApplication.py | 2 +- .../VersionUpgrade41to42.py | 14 +--- .../VersionUpgrade43to44.py | 68 +++++++++++++++++++ .../VersionUpgrade43to44/__init__.py | 62 +++++++++++++++++ .../VersionUpgrade43to44/plugin.json | 8 +++ .../tests/TestVersionUpgrade43To44.py} | 4 +- resources/bundled_packages/cura.json | 17 +++++ resources/definitions/fdmextruder.def.json | 2 +- resources/definitions/fdmprinter.def.json | 2 +- .../quality/abax_pri3/apri3_pla_fast.inst.cfg | 2 +- .../quality/abax_pri3/apri3_pla_high.inst.cfg | 2 +- .../abax_pri3/apri3_pla_normal.inst.cfg | 2 +- .../quality/abax_pri5/apri5_pla_fast.inst.cfg | 2 +- .../quality/abax_pri5/apri5_pla_high.inst.cfg | 2 +- .../abax_pri5/apri5_pla_normal.inst.cfg | 2 +- .../abax_titan/atitan_pla_fast.inst.cfg | 2 +- .../abax_titan/atitan_pla_high.inst.cfg | 2 +- .../abax_titan/atitan_pla_normal.inst.cfg | 2 +- .../abs/anycubic_4max_abs_draft.inst.cfg | 2 +- .../abs/anycubic_4max_abs_high.inst.cfg | 2 +- .../abs/anycubic_4max_abs_normal.inst.cfg | 2 +- .../anycubic_4max_draft.inst.cfg | 2 +- .../anycubic_4max/anycubic_4max_high.inst.cfg | 2 +- .../anycubic_4max_normal.inst.cfg | 2 +- .../hips/anycubic_4max_hips_draft.inst.cfg | 2 +- .../hips/anycubic_4max_hips_high.inst.cfg | 2 +- .../hips/anycubic_4max_hips_normal.inst.cfg | 2 +- .../petg/anycubic_4max_petg_draft.inst.cfg | 2 +- .../petg/anycubic_4max_petg_high.inst.cfg | 2 +- .../petg/anycubic_4max_petg_normal.inst.cfg | 2 +- .../pla/anycubic_4max_pla_draft.inst.cfg | 2 +- .../pla/anycubic_4max_pla_high.inst.cfg | 2 +- .../pla/anycubic_4max_pla_normal.inst.cfg | 2 +- .../anycubic_chiron_draft.inst.cfg | 2 +- .../anycubic_chiron_high.inst.cfg | 2 +- .../anycubic_chiron_normal.inst.cfg | 2 +- .../anycubic_i3_mega_draft.inst.cfg | 2 +- .../anycubic_i3_mega_high.inst.cfg | 2 +- .../anycubic_i3_mega_normal.inst.cfg | 2 +- .../bp_BVOH_Coarse_Quality.inst.cfg | 2 +- .../bp_BVOH_High_Quality.inst.cfg | 2 +- .../bp_BVOH_Normal_Quality.inst.cfg | 2 +- .../bp_Innoflex60_Coarse_Quality.inst.cfg | 2 +- .../bp_Innoflex60_High_Quality.inst.cfg | 2 +- .../bp_Innoflex60_Normal_Quality.inst.cfg | 2 +- .../bp_PET_Coarse_Quality.inst.cfg | 2 +- .../bp_PET_High_Quality.inst.cfg | 2 +- .../bp_PET_Normal_Quality.inst.cfg | 2 +- .../bp_PLA_Coarse_Quality.inst.cfg | 2 +- .../bp_PLA_High_Quality.inst.cfg | 2 +- .../bp_PLA_Normal_Quality.inst.cfg | 2 +- .../bp_PVA_Coarse_Quality.inst.cfg | 2 +- .../bp_PVA_High_Quality.inst.cfg | 2 +- .../bp_PVA_Normal_Quality.inst.cfg | 2 +- .../bp_global_Coarse_Quality.inst.cfg | 2 +- .../bp_global_High_Quality.inst.cfg | 2 +- .../bp_global_Normal_Quality.inst.cfg | 2 +- .../abs/cartesio_0.25_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.25_abs_normal.inst.cfg | 2 +- .../abs/cartesio_0.4_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.4_abs_normal.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_coarse.inst.cfg | 2 +- .../cartesio_0.8_abs_extra_coarse.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_normal.inst.cfg | 2 +- .../cartesio_0.4_arnitel2045_high.inst.cfg | 2 +- .../cartesio_0.4_arnitel2045_normal.inst.cfg | 2 +- .../cartesio_global_Coarse_Quality.inst.cfg | 2 +- ...tesio_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../cartesio_global_High_Quality.inst.cfg | 2 +- .../cartesio_global_Normal_Quality.inst.cfg | 2 +- .../hips/cartesio_0.25_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.25_hips_normal.inst.cfg | 2 +- .../hips/cartesio_0.4_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.4_hips_normal.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_coarse.inst.cfg | 2 +- .../cartesio_0.8_hips_extra_coarse.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_normal.inst.cfg | 2 +- .../nylon/cartesio_0.25_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.25_nylon_normal.inst.cfg | 2 +- .../nylon/cartesio_0.4_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.4_nylon_normal.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_coarse.inst.cfg | 2 +- .../cartesio_0.8_nylon_extra_coarse.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_normal.inst.cfg | 2 +- .../pc/cartesio_0.25_pc_high.inst.cfg | 2 +- .../pc/cartesio_0.25_pc_normal.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.4_pc_high.inst.cfg | 2 +- .../pc/cartesio_0.4_pc_normal.inst.cfg | 2 +- .../pc/cartesio_0.8_pc_coarse.inst.cfg | 2 +- .../pc/cartesio_0.8_pc_extra_coarse.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.8_pc_high.inst.cfg | 2 +- .../pc/cartesio_0.8_pc_normal.inst.cfg | 2 +- .../petg/cartesio_0.25_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.25_petg_normal.inst.cfg | 2 +- .../petg/cartesio_0.4_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.4_petg_normal.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_coarse.inst.cfg | 2 +- .../cartesio_0.8_petg_extra_coarse.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_normal.inst.cfg | 2 +- .../pla/cartesio_0.25_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.25_pla_normal.inst.cfg | 2 +- .../pla/cartesio_0.4_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.4_pla_normal.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_coarse.inst.cfg | 2 +- .../cartesio_0.8_pla_extra_coarse.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_normal.inst.cfg | 2 +- .../pva/cartesio_0.25_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.25_pva_normal.inst.cfg | 2 +- .../pva/cartesio_0.4_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.4_pva_normal.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_coarse.inst.cfg | 2 +- .../cartesio_0.8_pva_extra_coarse.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_normal.inst.cfg | 2 +- resources/quality/coarse.inst.cfg | 2 +- .../creality/base/base_0.2_ABS_super.inst.cfg | 2 +- .../creality/base/base_0.2_ABS_ultra.inst.cfg | 2 +- .../base/base_0.2_PETG_super.inst.cfg | 2 +- .../base/base_0.2_PETG_ultra.inst.cfg | 2 +- .../creality/base/base_0.2_PLA_super.inst.cfg | 2 +- .../creality/base/base_0.2_PLA_ultra.inst.cfg | 2 +- .../base/base_0.3_ABS_adaptive.inst.cfg | 2 +- .../creality/base/base_0.3_ABS_low.inst.cfg | 2 +- .../base/base_0.3_ABS_standard.inst.cfg | 2 +- .../creality/base/base_0.3_ABS_super.inst.cfg | 2 +- .../base/base_0.3_PETG_adaptive.inst.cfg | 2 +- .../creality/base/base_0.3_PETG_low.inst.cfg | 2 +- .../base/base_0.3_PETG_standard.inst.cfg | 2 +- .../base/base_0.3_PETG_super.inst.cfg | 2 +- .../base/base_0.3_PLA_adaptive.inst.cfg | 2 +- .../creality/base/base_0.3_PLA_low.inst.cfg | 2 +- .../base/base_0.3_PLA_standard.inst.cfg | 2 +- .../creality/base/base_0.3_PLA_super.inst.cfg | 2 +- .../base/base_0.3_TPU_adaptive.inst.cfg | 2 +- .../base/base_0.3_TPU_standard.inst.cfg | 2 +- .../creality/base/base_0.3_TPU_super.inst.cfg | 2 +- .../base/base_0.4_ABS_adaptive.inst.cfg | 2 +- .../creality/base/base_0.4_ABS_low.inst.cfg | 2 +- .../base/base_0.4_ABS_standard.inst.cfg | 2 +- .../creality/base/base_0.4_ABS_super.inst.cfg | 2 +- .../base/base_0.4_PETG_adaptive.inst.cfg | 2 +- .../creality/base/base_0.4_PETG_low.inst.cfg | 2 +- .../base/base_0.4_PETG_standard.inst.cfg | 2 +- .../base/base_0.4_PETG_super.inst.cfg | 2 +- .../base/base_0.4_PLA_adaptive.inst.cfg | 2 +- .../creality/base/base_0.4_PLA_low.inst.cfg | 2 +- .../base/base_0.4_PLA_standard.inst.cfg | 2 +- .../creality/base/base_0.4_PLA_super.inst.cfg | 2 +- .../base/base_0.4_TPU_adaptive.inst.cfg | 2 +- .../base/base_0.4_TPU_standard.inst.cfg | 2 +- .../creality/base/base_0.4_TPU_super.inst.cfg | 2 +- .../base/base_0.5_ABS_adaptive.inst.cfg | 2 +- .../creality/base/base_0.5_ABS_low.inst.cfg | 2 +- .../base/base_0.5_ABS_standard.inst.cfg | 2 +- .../creality/base/base_0.5_ABS_super.inst.cfg | 2 +- .../base/base_0.5_PETG_adaptive.inst.cfg | 2 +- .../creality/base/base_0.5_PETG_low.inst.cfg | 2 +- .../base/base_0.5_PETG_standard.inst.cfg | 2 +- .../base/base_0.5_PETG_super.inst.cfg | 2 +- .../base/base_0.5_PLA_adaptive.inst.cfg | 2 +- .../creality/base/base_0.5_PLA_low.inst.cfg | 2 +- .../base/base_0.5_PLA_standard.inst.cfg | 2 +- .../creality/base/base_0.5_PLA_super.inst.cfg | 2 +- .../base/base_0.5_TPU_adaptive.inst.cfg | 2 +- .../base/base_0.5_TPU_standard.inst.cfg | 2 +- .../creality/base/base_0.5_TPU_super.inst.cfg | 2 +- .../base/base_0.6_ABS_standard.inst.cfg | 2 +- .../base/base_0.6_PETG_standard.inst.cfg | 2 +- .../creality/base/base_0.6_PLA_draft.inst.cfg | 2 +- .../creality/base/base_0.6_PLA_low.inst.cfg | 2 +- .../base/base_0.6_PLA_standard.inst.cfg | 2 +- .../base/base_0.6_TPU_standard.inst.cfg | 2 +- .../creality/base/base_0.8_ABS_draft.inst.cfg | 2 +- .../base/base_0.8_PETG_draft.inst.cfg | 2 +- .../creality/base/base_0.8_PLA_draft.inst.cfg | 2 +- .../creality/base/base_0.8_TPU_draft.inst.cfg | 2 +- .../creality/base/base_1.0_ABS_draft.inst.cfg | 2 +- .../base/base_1.0_PETG_draft.inst.cfg | 2 +- .../creality/base/base_1.0_PLA_draft.inst.cfg | 2 +- .../creality/base/base_1.0_TPU_draft.inst.cfg | 2 +- .../base/base_global_adaptive.inst.cfg | 2 +- .../creality/base/base_global_draft.inst.cfg | 2 +- .../creality/base/base_global_low.inst.cfg | 2 +- .../base/base_global_standard.inst.cfg | 2 +- .../creality/base/base_global_super.inst.cfg | 2 +- .../creality/base/base_global_ultra.inst.cfg | 2 +- .../dagoma_discoeasy200_pla_fast.inst.cfg | 2 +- .../dagoma_discoeasy200_pla_fine.inst.cfg | 2 +- .../dagoma_discoeasy200_pla_standard.inst.cfg | 2 +- .../dagoma/dagoma_global_fast.inst.cfg | 2 +- .../dagoma/dagoma_global_fine.inst.cfg | 2 +- .../dagoma/dagoma_global_standard.inst.cfg | 2 +- .../dagoma/dagoma_magis_pla_fast.inst.cfg | 2 +- .../dagoma/dagoma_magis_pla_fine.inst.cfg | 2 +- .../dagoma/dagoma_magis_pla_standard.inst.cfg | 2 +- .../dagoma/dagoma_neva_pla_fast.inst.cfg | 2 +- .../dagoma/dagoma_neva_pla_fine.inst.cfg | 2 +- .../dagoma/dagoma_neva_pla_standard.inst.cfg | 2 +- .../deltacomb_abs_Draft_Quality.inst.cfg | 2 +- .../deltacomb_abs_Fast_Quality.inst.cfg | 2 +- .../deltacomb_abs_High_Quality.inst.cfg | 2 +- .../deltacomb_abs_Normal_Quality.inst.cfg | 2 +- .../deltacomb_abs_Verydraft_Quality.inst.cfg | 2 +- .../deltacomb_global_Draft_Quality.inst.cfg | 2 +- .../deltacomb_global_Fast_Quality.inst.cfg | 2 +- .../deltacomb_global_High_Quality.inst.cfg | 2 +- .../deltacomb_global_Normal_Quality.inst.cfg | 2 +- ...eltacomb_global_Verydraft_Quality.inst.cfg | 2 +- .../deltacomb_petg_Draft_Quality.inst.cfg | 2 +- .../deltacomb_petg_Fast_Quality.inst.cfg | 2 +- .../deltacomb_petg_High_Quality.inst.cfg | 2 +- .../deltacomb_petg_Normal_Quality.inst.cfg | 2 +- .../deltacomb_petg_Verydraft_Quality.inst.cfg | 2 +- .../deltacomb_pla_Draft_Quality.inst.cfg | 2 +- .../deltacomb_pla_Fast_Quality.inst.cfg | 2 +- .../deltacomb_pla_High_Quality.inst.cfg | 2 +- .../deltacomb_pla_Normal_Quality.inst.cfg | 2 +- .../deltacomb_pla_Verydraft_Quality.inst.cfg | 2 +- .../deltacomb_tpu_Draft_Quality.inst.cfg | 2 +- .../deltacomb_tpu_Fast_Quality.inst.cfg | 2 +- .../deltacomb_tpu_High_Quality.inst.cfg | 2 +- .../deltacomb_tpu_Normal_Quality.inst.cfg | 2 +- .../deltacomb_tpu_Verydraft_Quality.inst.cfg | 2 +- resources/quality/draft.inst.cfg | 2 +- resources/quality/extra_coarse.inst.cfg | 2 +- resources/quality/extra_fast.inst.cfg | 2 +- .../fabtotum/fabtotum_abs_fast.inst.cfg | 2 +- .../fabtotum/fabtotum_abs_high.inst.cfg | 2 +- .../fabtotum/fabtotum_abs_normal.inst.cfg | 2 +- .../fabtotum/fabtotum_nylon_fast.inst.cfg | 2 +- .../fabtotum/fabtotum_nylon_high.inst.cfg | 2 +- .../fabtotum/fabtotum_nylon_normal.inst.cfg | 2 +- .../fabtotum/fabtotum_pla_fast.inst.cfg | 2 +- .../fabtotum/fabtotum_pla_high.inst.cfg | 2 +- .../fabtotum/fabtotum_pla_normal.inst.cfg | 2 +- .../fabtotum/fabtotum_tpu_fast.inst.cfg | 2 +- .../fabtotum/fabtotum_tpu_high.inst.cfg | 2 +- .../fabtotum/fabtotum_tpu_normal.inst.cfg | 2 +- resources/quality/fast.inst.cfg | 2 +- .../gmax15plus_global_dual_normal.inst.cfg | 2 +- .../gmax15plus_global_dual_thick.inst.cfg | 2 +- .../gmax15plus_global_dual_thin.inst.cfg | 2 +- ...gmax15plus_global_dual_very_thick.inst.cfg | 2 +- .../gmax15plus_global_normal.inst.cfg | 2 +- .../gmax15plus_global_thick.inst.cfg | 2 +- .../gmax15plus_global_thin.inst.cfg | 2 +- .../gmax15plus_global_very_thick.inst.cfg | 2 +- resources/quality/high.inst.cfg | 2 +- .../hms434_global_Coarse_Quality.inst.cfg | 2 +- ...ms434_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../hms434_global_High_Quality.inst.cfg | 2 +- .../hms434_global_Normal_Quality.inst.cfg | 2 +- ...ms434_global_Super_Coarse_Quality.inst.cfg | 2 +- ...ms434_global_Ultra_Coarse_Quality.inst.cfg | 2 +- .../PETG/jb2_generic_petg_0.4_coarse.inst.cfg | 2 +- .../PETG/jb2_generic_petg_0.4_fine.inst.cfg | 2 +- .../PETG/jb2_generic_petg_0.4_medium.inst.cfg | 2 +- .../PLA/jb2_generic_pla_0.4_coarse.inst.cfg | 2 +- .../PLA/jb2_generic_pla_0.4_fine.inst.cfg | 2 +- .../PLA/jb2_generic_pla_0.4_medium.inst.cfg | 2 +- .../jb2_generic_pla_0.4_ultrafine.inst.cfg | 2 +- .../jb2_global_coarse.inst.cfg | 2 +- .../jb2_global_fine.inst.cfg | 2 +- .../jb2_global_normal.inst.cfg | 2 +- .../jb2_global_ultrafine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg | 2 +- .../kemiq_q2_beta_abs_extra_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg | 2 +- .../kemiq_q2_beta_abs_normal.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg | 2 +- .../kemiq_q2_beta_pla_extra_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg | 2 +- .../kemiq_q2_beta_pla_normal.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg | 2 +- .../kemiq_q2_gama_pla_extra_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg | 2 +- .../kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg | 2 +- .../kemiq_q2_gama_pla_normal.inst.cfg | 2 +- .../abs/malyan_m200_abs_draft.inst.cfg | 2 +- .../abs/malyan_m200_abs_fast.inst.cfg | 2 +- .../abs/malyan_m200_abs_high.inst.cfg | 2 +- .../abs/malyan_m200_abs_normal.inst.cfg | 2 +- .../abs/malyan_m200_abs_superdraft.inst.cfg | 2 +- .../abs/malyan_m200_abs_thickerdraft.inst.cfg | 2 +- .../abs/malyan_m200_abs_ultra.inst.cfg | 2 +- .../abs/malyan_m200_abs_verydraft.inst.cfg | 2 +- .../malyan_m200_global_Draft_Quality.inst.cfg | 2 +- .../malyan_m200_global_Fast_Quality.inst.cfg | 2 +- .../malyan_m200_global_High_Quality.inst.cfg | 2 +- ...malyan_m200_global_Normal_Quality.inst.cfg | 2 +- ...an_m200_global_SuperDraft_Quality.inst.cfg | 2 +- ..._m200_global_ThickerDraft_Quality.inst.cfg | 2 +- .../malyan_m200_global_Ultra_Quality.inst.cfg | 2 +- ...yan_m200_global_VeryDraft_Quality.inst.cfg | 2 +- .../petg/malyan_m200_petg_draft.inst.cfg | 2 +- .../petg/malyan_m200_petg_fast.inst.cfg | 2 +- .../petg/malyan_m200_petg_high.inst.cfg | 2 +- .../petg/malyan_m200_petg_normal.inst.cfg | 2 +- .../petg/malyan_m200_petg_superdraft.inst.cfg | 2 +- .../malyan_m200_petg_thickerdraft.inst.cfg | 2 +- .../petg/malyan_m200_petg_ultra.inst.cfg | 2 +- .../petg/malyan_m200_petg_verydraft.inst.cfg | 2 +- .../pla/malyan_m200_pla_draft.inst.cfg | 2 +- .../pla/malyan_m200_pla_fast.inst.cfg | 2 +- .../pla/malyan_m200_pla_high.inst.cfg | 2 +- .../pla/malyan_m200_pla_normal.inst.cfg | 2 +- .../pla/malyan_m200_pla_superdraft.inst.cfg | 2 +- .../pla/malyan_m200_pla_thickerdraft.inst.cfg | 2 +- .../pla/malyan_m200_pla_ultra.inst.cfg | 2 +- .../pla/malyan_m200_pla_verydraft.inst.cfg | 2 +- ...onoprice_select_mini_v2_abs_draft.inst.cfg | 2 +- ...monoprice_select_mini_v2_abs_fast.inst.cfg | 2 +- ...monoprice_select_mini_v2_abs_high.inst.cfg | 2 +- ...noprice_select_mini_v2_abs_normal.inst.cfg | 2 +- ...ice_select_mini_v2_abs_superdraft.inst.cfg | 2 +- ...e_select_mini_v2_abs_thickerdraft.inst.cfg | 2 +- ...onoprice_select_mini_v2_abs_ultra.inst.cfg | 2 +- ...rice_select_mini_v2_abs_verydraft.inst.cfg | 2 +- ...lect_mini_v2_global_Draft_Quality.inst.cfg | 2 +- ...elect_mini_v2_global_Fast_Quality.inst.cfg | 2 +- ...elect_mini_v2_global_High_Quality.inst.cfg | 2 +- ...ect_mini_v2_global_Normal_Quality.inst.cfg | 2 +- ...mini_v2_global_SuperDraft_Quality.inst.cfg | 2 +- ...ni_v2_global_ThickerDraft_Quality.inst.cfg | 2 +- ...lect_mini_v2_global_Ultra_Quality.inst.cfg | 2 +- ..._mini_v2_global_VeryDraft_Quality.inst.cfg | 2 +- ...oprice_select_mini_v2_nylon_draft.inst.cfg | 2 +- ...noprice_select_mini_v2_nylon_fast.inst.cfg | 2 +- ...noprice_select_mini_v2_nylon_high.inst.cfg | 2 +- ...price_select_mini_v2_nylon_normal.inst.cfg | 2 +- ...e_select_mini_v2_nylon_superdraft.inst.cfg | 2 +- ...select_mini_v2_nylon_thickerdraft.inst.cfg | 2 +- ...oprice_select_mini_v2_nylon_ultra.inst.cfg | 2 +- ...ce_select_mini_v2_nylon_verydraft.inst.cfg | 2 +- ...monoprice_select_mini_v2_pc_draft.inst.cfg | 2 +- .../monoprice_select_mini_v2_pc_fast.inst.cfg | 2 +- .../monoprice_select_mini_v2_pc_high.inst.cfg | 2 +- ...onoprice_select_mini_v2_pc_normal.inst.cfg | 2 +- ...rice_select_mini_v2_pc_superdraft.inst.cfg | 2 +- ...ce_select_mini_v2_pc_thickerdraft.inst.cfg | 2 +- ...monoprice_select_mini_v2_pc_ultra.inst.cfg | 2 +- ...price_select_mini_v2_pc_verydraft.inst.cfg | 2 +- ...noprice_select_mini_v2_petg_draft.inst.cfg | 2 +- ...onoprice_select_mini_v2_petg_fast.inst.cfg | 2 +- ...onoprice_select_mini_v2_petg_high.inst.cfg | 2 +- ...oprice_select_mini_v2_petg_normal.inst.cfg | 2 +- ...ce_select_mini_v2_petg_superdraft.inst.cfg | 2 +- ..._select_mini_v2_petg_thickerdraft.inst.cfg | 2 +- ...noprice_select_mini_v2_petg_ultra.inst.cfg | 2 +- ...ice_select_mini_v2_petg_verydraft.inst.cfg | 2 +- ...onoprice_select_mini_v2_pla_draft.inst.cfg | 2 +- ...monoprice_select_mini_v2_pla_fast.inst.cfg | 2 +- ...monoprice_select_mini_v2_pla_high.inst.cfg | 2 +- ...noprice_select_mini_v2_pla_normal.inst.cfg | 2 +- ...ice_select_mini_v2_pla_superdraft.inst.cfg | 2 +- ...e_select_mini_v2_pla_thickerdraft.inst.cfg | 2 +- ...onoprice_select_mini_v2_pla_ultra.inst.cfg | 2 +- ...rice_select_mini_v2_pla_verydraft.inst.cfg | 2 +- resources/quality/normal.inst.cfg | 2 +- .../quality/nwa3d_a31/nwa3d_a31_best.inst.cfg | 2 +- .../quality/nwa3d_a31/nwa3d_a31_e.inst.cfg | 2 +- .../quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg | 2 +- .../nwa3d_a31/nwa3d_a31_normal.inst.cfg | 2 +- .../quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 2 +- .../quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 2 +- .../quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 2 +- .../peopoly_moai/peopoly_moai_coarse.inst.cfg | 2 +- .../peopoly_moai/peopoly_moai_draft.inst.cfg | 2 +- .../peopoly_moai_extra_high.inst.cfg | 2 +- .../peopoly_moai/peopoly_moai_high.inst.cfg | 2 +- .../peopoly_moai/peopoly_moai_normal.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 2 +- .../s3d_std0.4_PVA-OKS_A.inst.cfg | 2 +- .../s3d_std0.4_PVA-OKS_B.inst.cfg | 2 +- .../s3d_std0.4_PVA-OKS_C.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg | 2 +- .../Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 2 +- .../s3d_std0.6_Nylon-1030_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 2 +- .../s3d_std0.6_PVA-OKS_B.inst.cfg | 2 +- .../s3d_std0.6_PVA-OKS_C.inst.cfg | 2 +- .../s3d_std0.6_PVA-OKS_D.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg | 2 +- .../Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 2 +- .../s3d_std0.8_PVA-OKS_C.inst.cfg | 2 +- .../s3d_std0.8_PVA-OKS_D.inst.cfg | 2 +- .../s3d_std0.8_PVA-OKS_E.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_TPU_C.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_TPU_D.inst.cfg | 2 +- .../Standard_0.8/s3d_std0.8_TPU_E.inst.cfg | 2 +- .../Standard_1.2/s3d_std1.2_PLA_H.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_A.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_B.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_C.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_D.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_E.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_F.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_G.inst.cfg | 2 +- .../quality/strateo3d/s3d_global_H.inst.cfg | 2 +- .../tevo_blackwidow_draft.inst.cfg | 2 +- .../tevo_blackwidow_high.inst.cfg | 2 +- .../tevo_blackwidow_normal.inst.cfg | 2 +- .../abs/tizyx_evy_0.2_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.3_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.4_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.4_abs_normal.inst.cfg | 2 +- .../abs/tizyx_evy_0.5_abs_draft.inst.cfg | 2 +- .../abs/tizyx_evy_0.5_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.5_abs_normal.inst.cfg | 2 +- .../abs/tizyx_evy_0.6_abs_coarse.inst.cfg | 2 +- .../abs/tizyx_evy_0.6_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.6_abs_normal.inst.cfg | 2 +- .../tizyx_evy_0.8_abs_extra_coarse.inst.cfg | 2 +- .../abs/tizyx_evy_0.8_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_0.8_abs_normal.inst.cfg | 2 +- .../petg/tizyx_evy_0.2_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.3_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.4_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.4_petg_normal.inst.cfg | 2 +- .../petg/tizyx_evy_0.5_petg_draft.inst.cfg | 2 +- .../petg/tizyx_evy_0.5_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.5_petg_normal.inst.cfg | 2 +- .../petg/tizyx_evy_0.6_petg_coarse.inst.cfg | 2 +- .../petg/tizyx_evy_0.6_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.6_petg_normal.inst.cfg | 2 +- .../tizyx_evy_0.8_petg_extra_coarse.inst.cfg | 2 +- .../petg/tizyx_evy_0.8_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_0.8_petg_normal.inst.cfg | 2 +- .../pla/tizyx_evy_0.2_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.3_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.4_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.4_pla_normal.inst.cfg | 2 +- .../pla/tizyx_evy_0.5_pla_draft.inst.cfg | 2 +- .../pla/tizyx_evy_0.5_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.5_pla_normal.inst.cfg | 2 +- .../pla/tizyx_evy_0.6_pla_coarse.inst.cfg | 2 +- .../pla/tizyx_evy_0.6_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.6_pla_normal.inst.cfg | 2 +- .../tizyx_evy_0.8_pla_extra_coarse.inst.cfg | 2 +- .../pla/tizyx_evy_0.8_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_0.8_pla_normal.inst.cfg | 2 +- .../tizyx_evy_0.2_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy_0.3_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy_0.4_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy_0.4_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy_0.5_pla_bois_draft.inst.cfg | 2 +- .../tizyx_evy_0.5_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy_0.6_pla_bois_coarse.inst.cfg | 2 +- .../tizyx_evy_0.6_pla_bois_normal.inst.cfg | 2 +- ...zyx_evy_0.8_pla_bois_extra_coarse.inst.cfg | 2 +- .../tizyx_evy_0.8_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy_global_Coarse_Quality.inst.cfg | 2 +- .../tizyx_evy_global_Draft_Quality.inst.cfg | 2 +- ...x_evy_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../tizyx_evy_global_Normal_Quality.inst.cfg | 2 +- .../tizyx_evy_dual_classic_abs_high.inst.cfg | 2 +- ...tizyx_evy_dual_classic_abs_normal.inst.cfg | 2 +- ...yx_evy_dual_direct_drive_abs_high.inst.cfg | 2 +- ..._evy_dual_direct_drive_abs_normal.inst.cfg | 2 +- .../tizyx_evy_dual_classic_petg_high.inst.cfg | 2 +- ...izyx_evy_dual_classic_petg_normal.inst.cfg | 2 +- ...x_evy_dual_direct_drive_petg_high.inst.cfg | 2 +- ...evy_dual_direct_drive_petg_normal.inst.cfg | 2 +- .../tizyx_evy_dual_classic_pla_flex.inst.cfg | 2 +- ...yx_evy_dual_classic_pla_flex_only.inst.cfg | 2 +- .../tizyx_evy_dual_classic_pla_high.inst.cfg | 2 +- ...tizyx_evy_dual_classic_pla_normal.inst.cfg | 2 +- ...yx_evy_dual_direct_drive_pla_flex.inst.cfg | 2 +- ...y_dual_direct_drive_pla_flex_only.inst.cfg | 2 +- ...yx_evy_dual_direct_drive_pla_high.inst.cfg | 2 +- ..._evy_dual_direct_drive_pla_normal.inst.cfg | 2 +- ...evy_dual_global_Flex_Only_Quality.inst.CFG | 2 +- ...izyx_evy_dual_global_Flex_Quality.inst.cfg | 2 +- ...izyx_evy_dual_global_High_Quality.inst.cfg | 2 +- ...yx_evy_dual_global_Normal_Quality.inst.cfg | 2 +- .../tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg | 2 +- .../quality/ultimaker2/um2_draft.inst.cfg | 2 +- .../quality/ultimaker2/um2_fast.inst.cfg | 2 +- .../quality/ultimaker2/um2_high.inst.cfg | 2 +- .../quality/ultimaker2/um2_normal.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.25_normal.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.4_fast.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.4_high.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.4_normal.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.6_normal.inst.cfg | 2 +- .../ultimaker2_plus/pla_0.8_normal.inst.cfg | 2 +- .../um2p_abs_0.25_normal.inst.cfg | 2 +- .../um2p_abs_0.4_fast.inst.cfg | 2 +- .../um2p_abs_0.4_high.inst.cfg | 2 +- .../um2p_abs_0.4_normal.inst.cfg | 2 +- .../um2p_abs_0.6_normal.inst.cfg | 2 +- .../um2p_abs_0.8_normal.inst.cfg | 2 +- .../um2p_cpe_0.25_normal.inst.cfg | 2 +- .../um2p_cpe_0.4_fast.inst.cfg | 2 +- .../um2p_cpe_0.4_high.inst.cfg | 2 +- .../um2p_cpe_0.4_normal.inst.cfg | 2 +- .../um2p_cpe_0.6_normal.inst.cfg | 2 +- .../um2p_cpe_0.8_normal.inst.cfg | 2 +- .../um2p_cpep_0.4_draft.inst.cfg | 2 +- .../um2p_cpep_0.4_normal.inst.cfg | 2 +- .../um2p_cpep_0.6_draft.inst.cfg | 2 +- .../um2p_cpep_0.6_normal.inst.cfg | 2 +- .../um2p_cpep_0.8_draft.inst.cfg | 2 +- .../um2p_cpep_0.8_normal.inst.cfg | 2 +- .../um2p_global_Coarse_Quality.inst.cfg | 2 +- .../um2p_global_Draft_Quality.inst.cfg | 2 +- .../um2p_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../um2p_global_Fast_Quality.inst.cfg | 2 +- .../um2p_global_High_Quality.inst.cfg | 2 +- .../um2p_global_Normal_Quality.inst.cfg | 2 +- ...2p_global_Slightly_Coarse_Quality.inst.cfg | 2 +- .../um2p_nylon_0.25_high.inst.cfg | 2 +- .../um2p_nylon_0.25_normal.inst.cfg | 2 +- .../um2p_nylon_0.4_fast.inst.cfg | 2 +- .../um2p_nylon_0.4_normal.inst.cfg | 2 +- .../um2p_nylon_0.6_fast.inst.cfg | 2 +- .../um2p_nylon_0.6_normal.inst.cfg | 2 +- .../um2p_nylon_0.8_draft.inst.cfg | 2 +- .../um2p_nylon_0.8_normal.inst.cfg | 2 +- .../um2p_pc_0.25_high.inst.cfg | 2 +- .../um2p_pc_0.25_normal.inst.cfg | 2 +- .../ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg | 2 +- .../um2p_pc_0.4_normal.inst.cfg | 2 +- .../ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg | 2 +- .../um2p_pc_0.6_normal.inst.cfg | 2 +- .../um2p_pc_0.8_draft.inst.cfg | 2 +- .../um2p_pc_0.8_normal.inst.cfg | 2 +- .../ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg | 2 +- .../um2p_pp_0.4_normal.inst.cfg | 2 +- .../um2p_pp_0.6_draft.inst.cfg | 2 +- .../ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg | 2 +- .../um2p_pp_0.8_draft.inst.cfg | 2 +- .../um2p_pp_0.8_verydraft.inst.cfg | 2 +- .../um2p_tpu_0.25_high.inst.cfg | 2 +- .../um2p_tpu_0.4_normal.inst.cfg | 2 +- .../um2p_tpu_0.6_fast.inst.cfg | 2 +- .../um3_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_PC_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_PC_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../um3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_PP_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- .../um3_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../um3_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- .../um3_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- .../um3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../um3_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../um3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../um3_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- .../um3_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../um3_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../um3_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- .../um3_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../um3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- .../um3_global_Draft_Quality.inst.cfg | 2 +- .../um3_global_Fast_Quality.inst.cfg | 2 +- .../um3_global_High_Quality.inst.cfg | 2 +- .../um3_global_Normal_Quality.inst.cfg | 2 +- .../um3_global_Superdraft_Quality.inst.cfg | 2 +- .../um3_global_Verydraft_Quality.inst.cfg | 2 +- .../umo_global_Coarse_Quality.inst.cfg | 2 +- .../umo_global_Draft_Quality.inst.cfg | 2 +- .../umo_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../umo_global_Fast_Quality.inst.cfg | 2 +- .../umo_global_High_Quality.inst.cfg | 2 +- .../umo_global_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- ...um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_PC_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PC_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_PP_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- ...s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg | 2 +- ..._s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg | 2 +- ...5_aa0.4_aluminum_ABS_High_Quality.inst.cfg | 2 +- ...aa0.4_aluminum_ABS_Normal_Quality.inst.cfg | 2 +- ...5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg | 2 +- ...s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg | 2 +- ..._aa0.4_aluminum_CPEP_High_Quality.inst.cfg | 2 +- ...a0.4_aluminum_CPEP_Normal_Quality.inst.cfg | 2 +- ...s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg | 2 +- ..._s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg | 2 +- ...5_aa0.4_aluminum_CPE_High_Quality.inst.cfg | 2 +- ...aa0.4_aluminum_CPE_Normal_Quality.inst.cfg | 2 +- ..._s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg | 2 +- ...m_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg | 2 +- ...s5_aa0.4_aluminum_PC_High_Quality.inst.cfg | 2 +- ..._aa0.4_aluminum_PC_Normal_Quality.inst.cfg | 2 +- ..._s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg | 2 +- ...m_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg | 2 +- ..._aa0.4_aluminum_PP_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- ...um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- ...m_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- ...um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- ...um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- ...s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg | 2 +- ...0.8_aluminum_ABS_Superdraft_Print.inst.cfg | 2 +- ...a0.8_aluminum_ABS_Verydraft_Print.inst.cfg | 2 +- ...s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg | 2 +- ....8_aluminum_CPEP_Superdraft_Print.inst.cfg | 2 +- ...0.8_aluminum_CPEP_Verydraft_Print.inst.cfg | 2 +- ...s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg | 2 +- ...0.8_aluminum_CPE_Superdraft_Print.inst.cfg | 2 +- ...a0.8_aluminum_CPE_Verydraft_Print.inst.cfg | 2 +- ...m_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg | 2 +- ...a0.8_aluminum_PC_Superdraft_Print.inst.cfg | 2 +- ...aa0.8_aluminum_PC_Verydraft_Print.inst.cfg | 2 +- ..._s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg | 2 +- ...a0.8_aluminum_PP_Superdraft_Print.inst.cfg | 2 +- ...aa0.8_aluminum_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- .../um_s5_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 2 +- .../um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 2 +- .../um_s5_global_Draft_Quality.inst.cfg | 2 +- .../um_s5_global_Fast_Quality.inst.cfg | 2 +- .../um_s5_global_High_Quality.inst.cfg | 2 +- .../um_s5_global_Normal_Quality.inst.cfg | 2 +- .../um_s5_global_Superdraft_Quality.inst.cfg | 2 +- .../um_s5_global_Verydraft_Quality.inst.cfg | 2 +- .../k8800_ABS_Extreme_Quality.inst.cfg | 2 +- .../k8800_ABS_High_Quality.inst.cfg | 2 +- .../k8800_ABS_Normal_Quality.inst.cfg | 2 +- .../k8800_Global_Extreme_Quality.inst.cfg | 2 +- .../k8800_Global_High_Quality.inst.cfg | 2 +- .../k8800_Global_Normal_Quality.inst.cfg | 2 +- .../k8800_PET_Extreme_Quality.inst.cfg | 2 +- .../k8800_PET_High_Quality.inst.cfg | 2 +- .../k8800_PET_Normal_Quality.inst.cfg | 2 +- .../k8800_PLA_Extreme_Quality.inst.cfg | 2 +- .../k8800_PLA_High_Quality.inst.cfg | 2 +- .../k8800_PLA_Normal_Quality.inst.cfg | 2 +- .../k8800_TPU_Extreme_Quality.inst.cfg | 2 +- .../k8800_TPU_High_Quality.inst.cfg | 2 +- .../k8800_TPU_Normal_Quality.inst.cfg | 2 +- .../zyyx/zyyx_agile_global_fast.inst.cfg | 2 +- .../zyyx/zyyx_agile_global_fine.inst.cfg | 2 +- .../zyyx/zyyx_agile_global_normal.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_flex_fast.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_flex_fine.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_flex_normal.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_pla_fast.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_pla_fine.inst.cfg | 2 +- .../zyyx/zyyx_agile_pro_pla_normal.inst.cfg | 2 +- .../Mark2_for_Ultimaker2_0.25.inst.cfg | 2 +- .../Mark2_for_Ultimaker2_0.4.inst.cfg | 2 +- .../Mark2_for_Ultimaker2_0.6.inst.cfg | 2 +- .../Mark2_for_Ultimaker2_0.8.inst.cfg | 2 +- resources/variants/cartesio_0.25.inst.cfg | 2 +- resources/variants/cartesio_0.4.inst.cfg | 2 +- resources/variants/cartesio_0.8.inst.cfg | 2 +- resources/variants/creality_base_0.2.inst.cfg | 2 +- resources/variants/creality_base_0.3.inst.cfg | 2 +- resources/variants/creality_base_0.4.inst.cfg | 2 +- resources/variants/creality_base_0.5.inst.cfg | 2 +- resources/variants/creality_base_0.6.inst.cfg | 2 +- resources/variants/creality_base_0.8.inst.cfg | 2 +- resources/variants/creality_base_1.0.inst.cfg | 2 +- resources/variants/creality_cr10_0.2.inst.cfg | 2 +- resources/variants/creality_cr10_0.3.inst.cfg | 2 +- resources/variants/creality_cr10_0.4.inst.cfg | 2 +- resources/variants/creality_cr10_0.5.inst.cfg | 2 +- resources/variants/creality_cr10_0.6.inst.cfg | 2 +- resources/variants/creality_cr10_0.8.inst.cfg | 2 +- resources/variants/creality_cr10_1.0.inst.cfg | 2 +- .../variants/creality_cr10mini_0.2.inst.cfg | 2 +- .../variants/creality_cr10mini_0.3.inst.cfg | 2 +- .../variants/creality_cr10mini_0.4.inst.cfg | 2 +- .../variants/creality_cr10mini_0.5.inst.cfg | 2 +- .../variants/creality_cr10mini_0.6.inst.cfg | 2 +- .../variants/creality_cr10mini_0.8.inst.cfg | 2 +- .../variants/creality_cr10mini_1.0.inst.cfg | 2 +- .../variants/creality_cr10s4_0.2.inst.cfg | 2 +- .../variants/creality_cr10s4_0.3.inst.cfg | 2 +- .../variants/creality_cr10s4_0.4.inst.cfg | 2 +- .../variants/creality_cr10s4_0.5.inst.cfg | 2 +- .../variants/creality_cr10s4_0.6.inst.cfg | 2 +- .../variants/creality_cr10s4_0.8.inst.cfg | 2 +- .../variants/creality_cr10s4_1.0.inst.cfg | 2 +- .../variants/creality_cr10s5_0.2.inst.cfg | 2 +- .../variants/creality_cr10s5_0.3.inst.cfg | 2 +- .../variants/creality_cr10s5_0.4.inst.cfg | 2 +- .../variants/creality_cr10s5_0.5.inst.cfg | 2 +- .../variants/creality_cr10s5_0.6.inst.cfg | 2 +- .../variants/creality_cr10s5_0.8.inst.cfg | 2 +- .../variants/creality_cr10s5_1.0.inst.cfg | 2 +- .../variants/creality_cr10s_0.2.inst.cfg | 2 +- .../variants/creality_cr10s_0.3.inst.cfg | 2 +- .../variants/creality_cr10s_0.4.inst.cfg | 2 +- .../variants/creality_cr10s_0.5.inst.cfg | 2 +- .../variants/creality_cr10s_0.6.inst.cfg | 2 +- .../variants/creality_cr10s_0.8.inst.cfg | 2 +- .../variants/creality_cr10s_1.0.inst.cfg | 2 +- .../variants/creality_cr10spro_0.2.inst.cfg | 2 +- .../variants/creality_cr10spro_0.3.inst.cfg | 2 +- .../variants/creality_cr10spro_0.4.inst.cfg | 2 +- .../variants/creality_cr10spro_0.5.inst.cfg | 2 +- .../variants/creality_cr10spro_0.6.inst.cfg | 2 +- .../variants/creality_cr10spro_0.8.inst.cfg | 2 +- .../variants/creality_cr10spro_1.0.inst.cfg | 2 +- resources/variants/creality_cr20_0.2.inst.cfg | 2 +- resources/variants/creality_cr20_0.3.inst.cfg | 2 +- resources/variants/creality_cr20_0.4.inst.cfg | 2 +- resources/variants/creality_cr20_0.5.inst.cfg | 2 +- resources/variants/creality_cr20_0.6.inst.cfg | 2 +- resources/variants/creality_cr20_0.8.inst.cfg | 2 +- resources/variants/creality_cr20_1.0.inst.cfg | 2 +- .../variants/creality_cr20pro_0.2.inst.cfg | 2 +- .../variants/creality_cr20pro_0.3.inst.cfg | 2 +- .../variants/creality_cr20pro_0.4.inst.cfg | 2 +- .../variants/creality_cr20pro_0.5.inst.cfg | 2 +- .../variants/creality_cr20pro_0.6.inst.cfg | 2 +- .../variants/creality_cr20pro_0.8.inst.cfg | 2 +- .../variants/creality_cr20pro_1.0.inst.cfg | 2 +- .../variants/creality_ender2_0.2.inst.cfg | 2 +- .../variants/creality_ender2_0.3.inst.cfg | 2 +- .../variants/creality_ender2_0.4.inst.cfg | 2 +- .../variants/creality_ender2_0.5.inst.cfg | 2 +- .../variants/creality_ender2_0.6.inst.cfg | 2 +- .../variants/creality_ender2_0.8.inst.cfg | 2 +- .../variants/creality_ender2_1.0.inst.cfg | 2 +- .../variants/creality_ender3_0.2.inst.cfg | 2 +- .../variants/creality_ender3_0.3.inst.cfg | 2 +- .../variants/creality_ender3_0.4.inst.cfg | 2 +- .../variants/creality_ender3_0.5.inst.cfg | 2 +- .../variants/creality_ender3_0.6.inst.cfg | 2 +- .../variants/creality_ender3_0.8.inst.cfg | 2 +- .../variants/creality_ender3_1.0.inst.cfg | 2 +- .../variants/creality_ender4_0.2.inst.cfg | 2 +- .../variants/creality_ender4_0.3.inst.cfg | 2 +- .../variants/creality_ender4_0.4.inst.cfg | 2 +- .../variants/creality_ender4_0.5.inst.cfg | 2 +- .../variants/creality_ender4_0.6.inst.cfg | 2 +- .../variants/creality_ender4_0.8.inst.cfg | 2 +- .../variants/creality_ender4_1.0.inst.cfg | 2 +- .../variants/creality_ender5_0.2.inst.cfg | 2 +- .../variants/creality_ender5_0.3.inst.cfg | 2 +- .../variants/creality_ender5_0.4.inst.cfg | 2 +- .../variants/creality_ender5_0.5.inst.cfg | 2 +- .../variants/creality_ender5_0.6.inst.cfg | 2 +- .../variants/creality_ender5_0.8.inst.cfg | 2 +- .../variants/creality_ender5_1.0.inst.cfg | 2 +- resources/variants/deltacomb_025_e3d.inst.cfg | 2 +- resources/variants/deltacomb_040_e3d.inst.cfg | 2 +- resources/variants/deltacomb_080_e3d.inst.cfg | 2 +- resources/variants/fabtotum_hyb35.inst.cfg | 2 +- resources/variants/fabtotum_lite04.inst.cfg | 2 +- resources/variants/fabtotum_lite06.inst.cfg | 2 +- resources/variants/fabtotum_pro02.inst.cfg | 2 +- resources/variants/fabtotum_pro04.inst.cfg | 2 +- resources/variants/fabtotum_pro06.inst.cfg | 2 +- resources/variants/fabtotum_pro08.inst.cfg | 2 +- resources/variants/felixpro2_0.25.inst.cfg | 2 +- resources/variants/felixpro2_0.35.inst.cfg | 2 +- resources/variants/felixpro2_0.50.inst.cfg | 2 +- resources/variants/felixpro2_0.70.inst.cfg | 2 +- resources/variants/felixtec4_0.25.inst.cfg | 2 +- resources/variants/felixtec4_0.35.inst.cfg | 2 +- resources/variants/felixtec4_0.50.inst.cfg | 2 +- resources/variants/felixtec4_0.70.inst.cfg | 2 +- .../variants/gmax15plus_025_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_04_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_05_e3d.inst.cfg | 2 +- .../variants/gmax15plus_05_jhead.inst.cfg | 2 +- resources/variants/gmax15plus_06_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_08_e3d.inst.cfg | 2 +- .../variants/gmax15plus_10_jhead.inst.cfg | 2 +- resources/variants/gmax15plus_12_e3d.inst.cfg | 2 +- .../variants/gmax15plus_dual_025_e3d.inst.cfg | 2 +- .../variants/gmax15plus_dual_04_e3d.inst.cfg | 2 +- .../variants/gmax15plus_dual_05_e3d.inst.cfg | 2 +- .../gmax15plus_dual_05_jhead.inst.cfg | 2 +- .../variants/gmax15plus_dual_06_e3d.inst.cfg | 2 +- .../variants/gmax15plus_dual_08_e3d.inst.cfg | 2 +- .../gmax15plus_dual_10_jhead.inst.cfg | 2 +- .../variants/hms434_0.25tpnozzle.inst.cfg | 2 +- .../variants/hms434_0.4tpnozzle.inst.cfg | 2 +- .../variants/hms434_0.6tpnozzle.inst.cfg | 2 +- .../variants/hms434_0.8tpnozzle.inst.cfg | 2 +- .../variants/hms434_1.2tpnozzle.inst.cfg | 2 +- .../variants/hms434_1.5tpnozzle.inst.cfg | 2 +- .../variants/imade3d_jellybox_0.4.inst.cfg | 2 +- .../variants/imade3d_jellybox_2_0.4.inst.cfg | 2 +- resources/variants/nwa3d_a31_04.inst.cfg | 2 +- resources/variants/nwa3d_a31_06.inst.cfg | 2 +- .../variants/strateo3d_standard_04.inst.cfg | 2 +- .../variants/strateo3d_standard_06.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_0.20.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_0.25.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_0.41.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_0.58.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_0.84.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_1.19.inst.cfg | 2 +- ..._discov3ry1_complete_um2plus_1.60.inst.cfg | 2 +- resources/variants/tizyx_evy_0.2.inst.cfg | 2 +- resources/variants/tizyx_evy_0.3.inst.cfg | 2 +- resources/variants/tizyx_evy_0.4.inst.cfg | 2 +- resources/variants/tizyx_evy_0.5.inst.cfg | 2 +- resources/variants/tizyx_evy_0.6.inst.cfg | 2 +- resources/variants/tizyx_evy_0.8.inst.cfg | 2 +- resources/variants/tizyx_evy_1.0.inst.cfg | 2 +- .../variants/tizyx_evy_dual_classic.inst.cfg | 2 +- .../tizyx_evy_dual_direct_drive.inst.cfg | 2 +- resources/variants/tizyx_k25_0.2.inst.cfg | 2 +- resources/variants/tizyx_k25_0.3.inst.cfg | 2 +- resources/variants/tizyx_k25_0.4.inst.cfg | 2 +- resources/variants/tizyx_k25_0.5.inst.cfg | 2 +- resources/variants/tizyx_k25_0.6.inst.cfg | 2 +- resources/variants/tizyx_k25_0.8.inst.cfg | 2 +- resources/variants/tizyx_k25_1.0.inst.cfg | 2 +- resources/variants/ultimaker2_0.25.inst.cfg | 2 +- resources/variants/ultimaker2_0.4.inst.cfg | 2 +- resources/variants/ultimaker2_0.6.inst.cfg | 2 +- resources/variants/ultimaker2_0.8.inst.cfg | 2 +- .../ultimaker2_extended_0.25.inst.cfg | 2 +- .../variants/ultimaker2_extended_0.4.inst.cfg | 2 +- .../variants/ultimaker2_extended_0.6.inst.cfg | 2 +- .../variants/ultimaker2_extended_0.8.inst.cfg | 2 +- .../ultimaker2_extended_plus_0.25.inst.cfg | 2 +- .../ultimaker2_extended_plus_0.4.inst.cfg | 2 +- .../ultimaker2_extended_plus_0.6.inst.cfg | 2 +- .../ultimaker2_extended_plus_0.8.inst.cfg | 2 +- .../variants/ultimaker2_plus_0.25.inst.cfg | 2 +- .../variants/ultimaker2_plus_0.4.inst.cfg | 2 +- .../variants/ultimaker2_plus_0.6.inst.cfg | 2 +- .../variants/ultimaker2_plus_0.8.inst.cfg | 2 +- resources/variants/ultimaker3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker3_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker3_aa04.inst.cfg | 2 +- resources/variants/ultimaker3_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker3_bb04.inst.cfg | 2 +- .../ultimaker3_extended_aa0.25.inst.cfg | 2 +- .../ultimaker3_extended_aa0.8.inst.cfg | 2 +- .../ultimaker3_extended_aa04.inst.cfg | 2 +- .../ultimaker3_extended_bb0.8.inst.cfg | 2 +- .../ultimaker3_extended_bb04.inst.cfg | 2 +- .../variants/ultimaker_s5_aa0.25.inst.cfg | 2 +- .../variants/ultimaker_s5_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker_s5_aa04.inst.cfg | 2 +- .../variants/ultimaker_s5_aluminum.inst.cfg | 2 +- .../variants/ultimaker_s5_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker_s5_bb04.inst.cfg | 2 +- resources/variants/ultimaker_s5_cc06.inst.cfg | 2 +- .../variants/ultimaker_s5_glass.inst.cfg | 2 +- 1022 files changed, 1174 insertions(+), 1031 deletions(-) create mode 100644 plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json rename plugins/VersionUpgrade/{VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py => VersionUpgrade43to44/tests/TestVersionUpgrade43To44.py} (85%) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f42f8b2798..8aa6af1444 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -147,7 +147,7 @@ class CuraApplication(QtApplication): # SettingVersion represents the set of settings available in the machine/extruder definitions. # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible # changes of the settings. - SettingVersion = 9 + SettingVersion = 10 Created = False diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py index a5d7436fde..a5a77a91e0 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -308,18 +308,6 @@ class VersionUpgrade41to42(VersionUpgrade): # Update version number. parser["metadata"]["setting_version"] = "8" - parser["general"]["version"] = "5" - - # We should only have 6 levels when we start. - assert "7" not in parser["containers"] - - # We added the intent container in Cura 4.2. This means that all other containers move one step down. - parser["containers"]["7"] = parser["containers"]["6"] - parser["containers"]["6"] = parser["containers"]["5"] - parser["containers"]["5"] = parser["containers"]["4"] - parser["containers"]["4"] = parser["containers"]["3"] - parser["containers"]["3"] = parser["containers"]["2"] - parser["containers"]["2"] = "empty_intent" # Change renamed profiles. if "containers" in parser: @@ -347,4 +335,4 @@ class VersionUpgrade41to42(VersionUpgrade): result = io.StringIO() parser.write(result) - return [filename], [result.getvalue()] \ No newline at end of file + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py new file mode 100644 index 0000000000..0bf0073d73 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -0,0 +1,68 @@ +import configparser +from typing import Tuple, List +import io +from UM.VersionUpgrade import VersionUpgrade + + +class VersionUpgrade43to44(VersionUpgrade): + pass + + def getCfgVersion(self, serialised: str) -> int: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialised) + format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. + setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) + return format_version * 1000000 + setting_version + + ## Upgrades Preferences to have the new version number. + # + # This renames the renamed settings in the list of visible settings. + def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "10" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades instance containers to have the new version + # number. + # + # This renames the renamed settings in the containers. + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation=None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "10" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades stacks to have the new version number. + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation=None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "10" + parser["general"]["version"] = "5" + + # We should only have 6 levels when we start. + assert "7" not in parser["containers"] + + # We added the intent container in Cura 4.4. This means that all other containers move one step down. + parser["containers"]["7"] = parser["containers"]["6"] + parser["containers"]["6"] = parser["containers"]["5"] + parser["containers"]["5"] = parser["containers"]["4"] + parser["containers"]["4"] = parser["containers"]["3"] + parser["containers"]["3"] = parser["containers"]["2"] + parser["containers"]["2"] = "empty_intent" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] \ No newline at end of file diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py b/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py new file mode 100644 index 0000000000..53319197e1 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py @@ -0,0 +1,62 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade43to44 + + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade43to44.VersionUpgrade43to44() + + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("preferences", 6000009): ("preferences", 6000010, upgrade.upgradePreferences), + ("machine_stack", 4000009): ("machine_stack", 5000010, upgrade.upgradeStack), + ("extruder_train", 4000009): ("extruder_train", 5000010, upgrade.upgradeStack), + ("definition_changes", 4000009): ("definition_changes", 4000010, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000009): ("quality_changes", 4000010, upgrade.upgradeInstanceContainer), + ("quality", 4000009): ("quality", 4000010, upgrade.upgradeInstanceContainer), + ("user", 4000009): ("user", 4000010, upgrade.upgradeInstanceContainer), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} + diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json new file mode 100644 index 0000000000..355f2f58db --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.3 to 4.4", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", + "api": "6.0", + "i18n-catalog": "cura" +} diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py b/plugins/VersionUpgrade/VersionUpgrade43to44/tests/TestVersionUpgrade43To44.py similarity index 85% rename from plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py rename to plugins/VersionUpgrade/VersionUpgrade43to44/tests/TestVersionUpgrade43To44.py index bd7f231b05..dc770c2c6f 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/tests/TestVersionUpgrade41To42.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/tests/TestVersionUpgrade43To44.py @@ -1,6 +1,6 @@ import configparser -import VersionUpgrade41to42 +import VersionUpgrade43to44 before_update = """[general] version = 4 @@ -22,7 +22,7 @@ type = machine def test_upgrade(): - upgrader = VersionUpgrade41to42.VersionUpgrade41to42() + upgrader = VersionUpgrade43to44.VersionUpgrade43to44() file_name, new_data = upgrader.upgradeStack(before_update, "whatever") parser = configparser.ConfigParser(interpolation=None) parser.read_string(new_data[0]) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 4d23d56e5c..92a1936d70 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -798,6 +798,23 @@ } } }, + "VersionUpgrade43to44": { + "package_info": { + "package_id": "VersionUpgrade43to44", + "package_type": "plugin", + "display_name": "Version Upgrade 4.3 to 4.4", + "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", + "package_version": "1.0.0", + "sdk_version": "6.0.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, "X3DReader": { "package_info": { "package_id": "X3DReader", diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 6554b2aa0f..fcde530ebf 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -6,7 +6,7 @@ "type": "extruder", "author": "Ultimaker", "manufacturer": "Unknown", - "setting_version": 9, + "setting_version": 10, "visible": false, "position": "0" }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f3143e08aa..e24baf5292 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7,7 +7,7 @@ "author": "Ultimaker", "category": "Other", "manufacturer": "Unknown", - "setting_version": 9, + "setting_version": 10, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index 2ca7c0b6d7..b975628e11 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 9623551128..55fde0e4f9 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index bbcdfa97aa..7ecd48919b 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index 4147d60e1c..08d0696860 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index 5783b20b31..c3375f12a6 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index 39e115d3da..f18e38f468 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg index a594a764c7..3d66e6a212 100644 --- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg index 2779bd53f3..9804541e1f 100644 --- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_titan [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg index a4ea654594..163797dff4 100644 --- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg index fa6862885b..d006c5d47b 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg index 43a3548526..9965525d59 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg index 2b38d44054..96655e7b0f 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg index a3b11b1e91..13716895a5 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg index b4b3681802..7801e1462b 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg index c084e52c9e..c97b5fa0d6 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg index ab53c04167..f878a78bc2 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg index 7521270faa..eb867e9898 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg index 7158673a3f..47bf46ffd0 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg index b0e80ce9ee..d26f8a7eba 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg index 6502ad1d70..4299c74820 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg index 7882d7958a..dfc6bbc8ae 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg index d012aa332c..70549350ef 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg index 451a52b3f7..5d4fe3f047 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg index 3ebbcfd64e..16a7132b02 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index 13dc0f8600..0789dd5837 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_chiron [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index 48fa2bc2e7..53027f220c 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_chiron [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index b02480505c..fedbac5a1c 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_chiron [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index eed1cbffe9..868c0a088e 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_i3_mega [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index 82317f6bb4..6c7eb77fac 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_i3_mega [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index 866891ea85..d4d578d4cb 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_i3_mega [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg index 49e2aeb145..42e658333e 100644 --- a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg index 15ce598763..cefd8d6b0a 100644 --- a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg index e9a69ac6ff..e087a95b96 100644 --- a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg index 474a98dc18..580b296860 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg index c1ae131dbc..8cefa3a69d 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg index 3e8ca2b314..718b4e7c26 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg index af127370d1..fbf9ababf9 100644 --- a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg index bfae50684f..16515f76a9 100644 --- a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg index db31cf210d..cb3b0a7adb 100644 --- a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg index 14144796cb..7d4a0247fa 100644 --- a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg index 54d015f5a3..391174b1f2 100644 --- a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg index d922092f5b..ac6ca153b4 100644 --- a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg index 35e2239b1d..dd111f5958 100644 --- a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg index 0d53bb78f5..28cdd75af6 100644 --- a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg index 30fa35fc5f..b4bf76d3ef 100644 --- a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg index d89cb9ee0d..ab3cd5f97c 100644 --- a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg index c55028e720..b30e902e99 100644 --- a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg index b3b376557e..f8272e1aa6 100644 --- a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index ec0ebfe2e0..b919c0f74f 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index 7fb32a60e0..7232de4e4e 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 36def6424b..5c9efabda7 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 8145cf1b22..2b48f4d213 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index e0d0478176..dfc2f61659 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index 9a88468b1e..ce0b49d016 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index 7b26e214ea..1028df1210 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 62e7f4434f..6aed341c87 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 40f0cc7afd..90c2b26490 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index b6c345df82..b3a51a71fa 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg index 61c9f5ca83..c47cfd8a98 100644 --- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg index e85786a130..d15d00d1f4 100644 --- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg index bcc8e0846e..dd41219d64 100644 --- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg index e49859f0af..244f0ca147 100644 --- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index 0324fc1e1a..71edea47d1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index aee9c45898..b77d4ee730 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index 86ce246b86..a7482e50b2 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index bccaa9c3f1..7064d34ae1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index 75caa2bac9..28a0faee3b 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 72d1bd42bc..0b1e060a42 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index fa270fc75e..9a7df57f76 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index 6c2dfba7c1..48e61387d0 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index f097fa2bfa..39eda78f37 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index 9378ad27d2..b6655bf6ac 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index bd6bfd1d2b..b444618d43 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index d0e760cfb7..3dbeb498d8 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index 093d13f519..5f95a7a049 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 639dd5de2d..dea47eb923 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index 8203c00403..e72ccd529f 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index ffb0326274..7a37916357 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 8085eb713e..04b6832974 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 070d80df41..2a75d4a716 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index a6f9618621..d038937fb4 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index 0fde39c50f..701ecc115f 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 539bf2db1c..6721d6dc96 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index a762d4c202..3228949fe5 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index b3d8f45432..5b5894f8e8 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index 68c0a0b912..f62ddc947e 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index a8e2430287..2e755ac25d 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index da853b248b..0f70febcc2 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index acfe3be51d..ad6933bfac 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index fd6310cb54..cac3dbca16 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index 5cbf7947d6..7eeb544314 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index e3cc50a79a..15b87d513b 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index fc4bdab4ac..966cac8e2f 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index 466431b4ca..0bf96f083b 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index a589cc595e..6fefd1eb64 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 274bd91b81..8a9131edf5 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 8cf24dd647..0c66584e80 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index 24400a2cc9..6e790bc1c1 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index 1972a2f53a..3136f27a62 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index f30fa5e1a4..c2f80ae30d 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index cc4198e0bd..648b34d05c 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index af2d18dd04..1d1b697c6b 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index 7101f93035..b7c8ff5291 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 4c819fe22b..8cb38eb36a 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index 3a041bfff1..b06d646eca 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index 483b40ac2e..a40f56ed48 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 73a1a22b26..05a5a9521c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index ac26639ccd..65982c8085 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 8708ebf478..344868276b 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index c749b5916c..b0cc949d2d 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg index 9421d321a9..1d68ca93af 100644 --- a/resources/quality/coarse.inst.cfg +++ b/resources/quality/coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg index 0d9df28874..866f7a38c5 100644 --- a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg index 281c5da5c5..a17ead7619 100644 --- a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg index 4d797a3f4d..4d583e8297 100644 --- a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg index 07edee6785..2cd3ca81a6 100644 --- a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg index fae4d02aa0..5121fde104 100644 --- a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg index dae6ebd759..0ff4f900a6 100644 --- a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg index 99a4e8356b..93bcfb6a94 100644 --- a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg index 7fa4a6a1ea..0c171dbe8f 100644 --- a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg index 219a345608..1dfa94777e 100644 --- a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg index 6876e65168..dbe3b2f2ed 100644 --- a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg index d715d56cbc..e36587e18d 100644 --- a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg index b5ba1504c4..16bfd42486 100644 --- a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg index 2d3ff53fc3..ba1f772400 100644 --- a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg index c0eb63514b..ea413ae19a 100644 --- a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg index 9bfaf8895e..002967d7a7 100644 --- a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg index ab940a2526..f2d98137a7 100644 --- a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg index 53978da83f..a8bbd71d89 100644 --- a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg index 1b7254bd2f..9d10e6512a 100644 --- a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg index 9e034e8cca..93deb58aa7 100644 --- a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg index 4852bf69a6..3311cd309a 100644 --- a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg index 2bfde0efa9..ef0a275474 100644 --- a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg index 520275a0f5..bddaac624e 100644 --- a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg index 89bdccd629..f064cd7395 100644 --- a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg index 055b848cd3..b3adb0fa35 100644 --- a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg index f52aa88990..6cebb415ea 100644 --- a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg index 6849aa5a13..fd9f1daaf8 100644 --- a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg index 2783001e7b..7b0480ac5f 100644 --- a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg index 7cbacaf204..a2ebc522b7 100644 --- a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg index b6635e6ff6..182d681e8c 100644 --- a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg index 944d51bdd2..238ab3c2b8 100644 --- a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg index 43def887b2..da84b3115d 100644 --- a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg index 99d45f4876..3141a28f38 100644 --- a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg index 436a879a1c..65bbed31f2 100644 --- a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg index acdc698d35..467a530878 100644 --- a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg index 97a9b538f0..8e623e67b5 100644 --- a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg index 789f77a99a..abf1714251 100644 --- a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg index 1fdfef8207..384f182ebe 100644 --- a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg index a9badeaef6..e7fbe50ff4 100644 --- a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg index 03c2793dee..d24eb2b7f8 100644 --- a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg index 7c60e021a1..1705611dc2 100644 --- a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg index 4a5ca2d240..1e369ab79d 100644 --- a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg index d01d1f1278..69401e5903 100644 --- a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg index d9686737d6..55783954a4 100644 --- a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg index c3e616189c..d61bfa0b89 100644 --- a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg index 68d503a42e..8784ff1e61 100644 --- a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg index ea37a110b7..93adb3d881 100644 --- a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg index 074435a1c4..38664d876a 100644 --- a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg index 8166732cfe..49ddb00090 100644 --- a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg index de5cc38668..8c3831a06d 100644 --- a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg index 4ed89a6a9b..5a2e73d7f0 100644 --- a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg index add52cbc4b..fe1b11ccab 100644 --- a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg index 387875783a..856883153c 100644 --- a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg index 0584060a13..b4d8142b48 100644 --- a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg index 7def6c01bb..94c0471d18 100644 --- a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg index 02089f67e3..e916b7a0fd 100644 --- a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg index 3f3ad9b04f..007478277f 100644 --- a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg index 39e49a0860..8cdf0afac0 100644 --- a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg index 95a3614d64..23a9a6dfb6 100644 --- a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg index a8f1d1de33..8090d45bd2 100644 --- a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg index 78518402fa..afc92ab32f 100644 --- a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg index c717e9a965..694fc9a0a8 100644 --- a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg index 0f255362a2..5aeee9302f 100644 --- a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg index 20a7a9c5f1..ac1cf05f9b 100644 --- a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg index d0fd7efa50..dd293a7585 100644 --- a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg index 60a1a3aff4..6f3276085f 100644 --- a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_global_adaptive.inst.cfg b/resources/quality/creality/base/base_global_adaptive.inst.cfg index 28a4584aed..9372dd97a1 100644 --- a/resources/quality/creality/base/base_global_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/creality/base/base_global_draft.inst.cfg b/resources/quality/creality/base/base_global_draft.inst.cfg index 9a1e46ec4b..156ff0bb53 100644 --- a/resources/quality/creality/base/base_global_draft.inst.cfg +++ b/resources/quality/creality/base/base_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/creality/base/base_global_low.inst.cfg b/resources/quality/creality/base/base_global_low.inst.cfg index b028efad1f..47f621ae73 100644 --- a/resources/quality/creality/base/base_global_low.inst.cfg +++ b/resources/quality/creality/base/base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = low weight = -4 diff --git a/resources/quality/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg index ad6baa215e..c498b5b7db 100644 --- a/resources/quality/creality/base/base_global_standard.inst.cfg +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/creality/base/base_global_super.inst.cfg b/resources/quality/creality/base/base_global_super.inst.cfg index c16c810f20..ae44762626 100644 --- a/resources/quality/creality/base/base_global_super.inst.cfg +++ b/resources/quality/creality/base/base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super weight = -1 diff --git a/resources/quality/creality/base/base_global_ultra.inst.cfg b/resources/quality/creality/base/base_global_ultra.inst.cfg index a8b374e289..6f4d8797ba 100644 --- a/resources/quality/creality/base/base_global_ultra.inst.cfg +++ b/resources/quality/creality/base/base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index cc8e2783d4..e0edca4275 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index bf91cf5acc..4f2b31a819 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 0f628f0556..71117230b4 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_global_fast.inst.cfg b/resources/quality/dagoma/dagoma_global_fast.inst.cfg index 0b56f82a33..8ed08f69fb 100644 --- a/resources/quality/dagoma/dagoma_global_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_global_fine.inst.cfg b/resources/quality/dagoma/dagoma_global_fine.inst.cfg index b85ed05034..7f6fc41a33 100644 --- a/resources/quality/dagoma/dagoma_global_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_global_standard.inst.cfg b/resources/quality/dagoma/dagoma_global_standard.inst.cfg index 1245e8a9b0..7c9bc4c12e 100644 --- a/resources/quality/dagoma/dagoma_global_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index dbbb076b77..563aa1556c 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_magis [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index 7cc4a03c31..b25ec2d714 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_magis [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index bb11395237..5d2611d20c 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_magis [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 617b001154..1cc9faddbb 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 93894e1c29..3c87cd672f 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 8c536f6d43..81d230d038 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg index a0f3a96176..1d02afbb12 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast (beta) definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg index bba51d78b7..e6964a9c38 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal (beta) definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg index 2035282415..1e122045c2 100755 --- a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine (beta) definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg index 188fe95fa1..6e123740ab 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine (beta) definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg index feda2686af..a94dd97b50 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast (beta) definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg index 39151cb3c5..8580b58217 100755 --- a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg index a55b20247d..4c1b266b5a 100755 --- a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg index c6e41e9f13..d2ee402ea9 100755 --- a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg index 0d085013cd..ecfeaa7369 100755 --- a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg index 38fb251367..411d3395fe 100755 --- a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg index 59ba1e4bb0..f4422cb9cc 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg index 044ec574d6..8b7911dbd3 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg index 4a790faa72..7f2a9f4029 100644 --- a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg index 184958e807..d7392dbe30 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg index 3246c4c690..e4a3b9de4b 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg index 64a92f92c0..9f1125557f 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg index cf28144e18..e0ab33459d 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg index 626757c3a6..71926d3123 100755 --- a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg index e1754f53cd..3fdd9555a0 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg index c8a58e412d..3d338892a8 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg index 7d471f2ae1..bd717a95f5 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg index f713578e81..7cd970b1e2 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg index 0e261b9b86..4f0de85125 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg index fde2e6474b..33af4c368b 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg index 1a553d744e..8dfc1226f2 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg index 6383f80278..517037e1f6 100644 --- a/resources/quality/draft.inst.cfg +++ b/resources/quality/draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg index 27fc02e44f..fd11ebce5f 100644 --- a/resources/quality/extra_coarse.inst.cfg +++ b/resources/quality/extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/extra_fast.inst.cfg b/resources/quality/extra_fast.inst.cfg index 8a89f1d7e1..5ed73ad867 100644 --- a/resources/quality/extra_fast.inst.cfg +++ b/resources/quality/extra_fast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index 62335375a6..a5627610c4 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index 2dccb4c78a..c0caeb3437 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index 84d0f05e70..c425c874ce 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index 69ddd80c5c..6afab75165 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = fabtotum [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index f21aa081a8..08bf81bac5 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fabtotum [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index 0a88cea8ba..3936d38d3b 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fabtotum [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index c10ab08d63..23235f5e16 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index cfb0077d36..55669eca85 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index 3c8368edb5..a1443e4b8c 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index 34edc97d5d..b07b182d24 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality [metadata] type = quality -setting_version = 9 +setting_version = 10 material = generic_tpu quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 6525305b3d..611cefb3c5 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -5,7 +5,7 @@ name = High Quality [metadata] type = quality -setting_version = 9 +setting_version = 10 material = generic_tpu quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index 9dbb57d404..99fb7db62b 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -5,7 +5,7 @@ name = Normal Quality [metadata] type = quality -setting_version = 9 +setting_version = 10 material = generic_tpu quality_type = normal weight = 0 diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg index ef70ea8cf0..f881832356 100644 --- a/resources/quality/fast.inst.cfg +++ b/resources/quality/fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 81f21a988c..4fb63a7cd6 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Normal Layers definition = gmax15plus_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index e48eb9ae38..15454d383a 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index 4e2cf13d14..8bd446e63a 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thin Layers definition = gmax15plus_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index 5b322f1625..c186684944 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Very Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg index 02c24fd592..3340696664 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Normal Layers definition = gmax15plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg index 1a7791b62c..4681dbd659 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thick Layers definition = gmax15plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg index b961802830..d310b44878 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thin Layers definition = gmax15plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg index 6ba235c50c..908e90fe15 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Very Thick Layers definition = gmax15plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index 32f6f9d303..30e2b47c07 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg index ba64a34080..a6e5ddd0a2 100644 --- a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg index 5a8e69e28a..b7bd62f096 100644 --- a/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg index f1ec57356e..4f99b136b8 100644 --- a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg index be9f94467a..4dbefdadea 100644 --- a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg index 6fb5f5d269..e1c5db19d2 100644 --- a/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Super Coarse definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = super coarse weight = -4 diff --git a/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg index e57b5847a5..21c609199f 100644 --- a/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra coarse weight = -4 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg index e3e29c421f..423e2d0987 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg index b9843f18e9..7c058ac68a 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg index 46e79a191d..d8c2f46e59 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg index cde1df2fbc..a20fe163d0 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg index ec35ca9ec6..2f8286c1b8 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg index abc1bf4115..db32843e2c 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg index a16b3c94ac..2727007967 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index 6c3df6024d..90768577f3 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 68d5ad4e42..e447bc79fd 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index f40027b7c7..afd6b5f06c 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index 27a0ccd2f2..f2e109909d 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg index 14fcb0bb51..322cb7481c 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg index 85f9da8623..326049b02b 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg index 68e18e08dc..ea93a2931b 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg index 1af16453d3..8bb74c3dae 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg index 044a82b2ec..b14647fb95 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg index 92de43f8b5..497d45efa2 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg index 53f31364d5..e305dc760b 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg index 2b0b33a502..3be1fb2883 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg index 609359774e..f3462ef32a 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg index e3fa16be48..95cd03ab29 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg index 613f653d25..e98449db9c 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_gama [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg index b7bc069f4a..10645593dc 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_gama [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg index 823728f70d..8432a9ead9 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_gama [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg index 5b0ae3fef7..c8e17a772d 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_gama [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg index 91cef5bc9d..9a234a59cc 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_gama [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg index b8e862362c..eb4c97cf27 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg index 6671f81d70..44b09f9547 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg index b934f65a22..898e4eda11 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg index 48884cbdc1..80fac2dffe 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg index 1b7459fe1b..ac135f6bf1 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg index ebd2f01faf..b93ed65fe4 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg index 16b310bbdf..3fa7d76b0a 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg index 701f3e8831..07f0ed7898 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg index fb05c245e0..0f685ab4ab 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg index be5328c48a..6d8f228c2c 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg index aef00ac069..e35f68a495 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg index 3d101d3370..32e2246ecf 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg index a0da95299d..776b240c21 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg index 8ced1ea9d2..8c86bc7a42 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg index 0c4daaf4e9..76bc0e962e 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg index 41f9e7070f..f7194347a5 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg index 3802d5a659..ae3de2e5b4 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg index 6c17331b26..d6b338fb43 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg index 302d82b922..1c3966036b 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg index 82aa3a03df..24a4a71292 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg index a2f804454e..b44212f2fd 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg index 3843210efa..6ed2d68813 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg index 151dcbb90f..436d4750f1 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg index 518f90ed5a..dd2af59f56 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg index aa4960f413..8cccd0d887 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg index 7990ce5b52..b3941891b7 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg index 58b1a63d0a..c901bed90e 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg index af8ed66005..9196423af0 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg index 299ff39d4f..d415ea159c 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg index e44ea7afab..7533aeca55 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg index 4424cd046c..c98b98695e 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg index 487248f5d1..b1983e11af 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg index aa9cae9e68..5703ed70ba 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg index 6ff65500c0..61f721bc6e 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg index c80526b130..f482c167d0 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg index ae73f0f486..e1b75f9735 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg index 0381f10f30..9ebdd4fe40 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg index 64753f31bc..91a87bb0cd 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg index d406a1a940..1209095246 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg index bd52990afb..5f8d7e964d 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg index 5978bcf77c..48977d2631 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg index edda3ca5a4..23a7a91006 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg index 1e6754dde3..7fc15ac57e 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg index 138e1af7f2..3d8138452a 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg index c82ac1a84e..f34136d4bd 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg index 7f69af7485..0c852fa4d9 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg index 65ca72e91d..ab23462d6e 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg index 3a40d52ee9..e1189b5c92 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg index e204b3c4ba..0fa5602385 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg index 036edddbe8..9956a32d47 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg index 0e51d209bf..e022337fd8 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg index bd6cf24330..dc49747ff2 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg index 7d8ede0b68..98a2f6a13b 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg index b561280140..72495c6975 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg index 65080eadce..57b306426a 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg index ad0d21c1a9..97426a8689 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg index 30f9130f73..939706e27c 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg index c4f822eda6..af06b692ae 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg index 6232403d13..906d0d0c6d 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg index e21822e2ce..477135c108 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg index 13667ce4ca..64f1811850 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg index fb26970ca7..6679dbe999 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg index bdeec6b14f..d94e228912 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg index 7cff35e02a..bd3f404abf 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg index e7ee01f721..47c439da4e 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg index 1113a5697d..211e4f780f 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg index 44c604ab3f..853a17ace9 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg index 760e080e8f..5b2b0fac23 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg index 1dba41d5b6..134bb4d4a1 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg index 7a404d9dc2..0094f4d1dc 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg index daeb36e1a6..b990a5d60a 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg index 62d06c79db..7275fb136b 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg index c28f9f7512..04687ec000 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg index 7e44c68e4c..46c5067b23 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg index 240e8d3246..19c5c6d1d2 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg index 949b3c23ce..6a68d6110a 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg index 99cb16b348..46e1797e16 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg index 938482178c..fb54021f50 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg index a51342f350..1b43dcc27f 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg index de08b5d49a..fcda0b6bc6 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 9 +setting_version = 10 type = quality material = generic_pla weight = 0 diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index ced09abe89..fb28bd7310 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fdmprinter [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index d3df09871e..53649d3742 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -5,7 +5,7 @@ name = Best Quality definition = nwa3d_a31 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 566d375156..320e995fdb 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -4,7 +4,7 @@ name = 0.6 Engineering Quality definition = nwa3d_a31 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = Engineering weight = -2 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 3661fcee06..ad35303020 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality definition = nwa3d_a31 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 7929fb8a46..7a75896032 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a31 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 0cd5c17d27..47949c5892 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = nwa3d_a5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index ae37eec499..697fafddf9 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = nwa3d_a5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 530794f569..519b2f2816 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index 50b8b32f3c..e548bfb29e 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = peopoly_moai [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index b3dffcf059..1a905f3097 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = peopoly_moai [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index d5fcfcc98e..5f95f5f6f2 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra High definition = peopoly_moai [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra_high weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 2a1ab44912..83139afcda 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = peopoly_moai [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 41fcfd67e6..2ebea78d6a 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = peopoly_moai [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index 5bce2647db..1d02843407 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 538a87c045..0d1ad41dd0 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index 3184be82fd..c9c14a4744 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index f70131cd97..da41d6228a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index e86f7e34ff..8a626b526e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index c03fb21cbe..f1589b9ad7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index 29b655c91b..ac7f3a1812 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index bf655b4944..e432e9adf2 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index fa81422998..fa1180951f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 8fb7ba8ed5..6c2c24035c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 28ad37478e..16386f7f87 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 544ba3b0bf..44c7962480 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index f86140b415..700d677918 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index 3036cbc215..28caa54cb8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index dd2a2f0c94..561e7b5298 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index 39fb0ba390..f56b35d65f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 3a6babd860..d35c02ca91 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index bd418bccd6..d9936c4d82 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 896c44ea06..b5b70275f4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 7c8aa8553a..cc44f06787 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index e1fc3c9935..ca4650cf82 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index c5a7407387..10930b6375 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 6f72a40983..bc3bf2df22 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 4d23e09d72..b6dcfdcafe 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index 698feba6d5..8acc53f3e0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index c3a1ff764a..0b101ae3c6 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 3f2c6a8617..d7eeb0f3b7 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index faf731cabd..a2fa319cb5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index dc5afdb463..e0c5636ea8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index eacda2df9b..171d465248 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 4a22a7de29..2f2c15569e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index dd1de2b731..8e9b10b48f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index d359b712db..dc3e6e66d6 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index 49dd435cb7..e134bdd738 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 1caddc5543..a437374a06 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index f4b98ed47c..8c0dbc0732 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index ffe642001e..5438710e18 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index ecdcfa2b49..8b0bfbebf8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index 6d719613f1..464bd61eb9 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index a30598c298..957945929a 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 95fc12cacb..4cfc5e2425 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index 190d73029a..998620ca4d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index 53d2e8b1da..161b4e9e6a 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index b80711fe8d..6bc87a7ac9 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index 69db96ff85..6714eb73a2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index a0a90933e2..d1a90a6b0b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index 8013c76be8..52c31ac93a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index ca86b5fce6..c6139eedca 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 92acfc67d8..c4515d2434 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 6d81b07329..7a0ae89493 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 3ebe7fc050..9e310406e4 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index 3840c6414c..8fef028e8f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index 9701fef992..bcabed9fb6 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index 7ed36d9d67..9bc4ebae63 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 2d44c9d084..fea9542fed 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 80e9934540..5cf1c2c5a9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index c597412185..e514ce8425 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index def6799406..883c733088 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index 569188ff3c..b7ec8a65db 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index b83b16b3ff..fcea53fbe5 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 368cbf59f0..61a455827c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg index 28bc40a7f7..29779c9b9f 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -4,7 +4,7 @@ name = H definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = h weight = -1 diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index 36765ea8cf..69a9bedd9e 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index afb61bb3b3..dbfd0c46f6 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index a0db1a5af4..e167da5fdb 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index 3d52f5d331..b1a00232ed 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -4,7 +4,7 @@ name = Medium Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index d3ce741a0d..ee2e45b511 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index 842e579f73..bc1bf264f3 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = f weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index a5dcd8c000..634cebecf6 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = g weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index 273ab89ba9..ea1a751190 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = h weight = 0 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index 47524c598f..5e2be0dc9e 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tevo_blackwidow [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 8e343cee1b..7fd0e24423 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tevo_blackwidow [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index 7a357f52e6..424eda97bf 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tevo_blackwidow [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg index 83ac9ec272..2e2a3cce5a 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg index 5219e96d29..adbb8a8ff4 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg index 816ef254a8..9bf480824e 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg index c0eb46043c..1aad72859a 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg index 423e309953..7329cf25ad 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg index d76ef22999..fd5ea15ada 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg index f9633339b1..eda120d767 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg index 882d0c70f7..d14f345eba 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg index 086e3128f9..869328e6f1 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg index 9e8fff9320..ee52b976fd 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg index 5dc2810b2c..ac4816f557 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg index f392c387b3..a4f1774544 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg index db8f07520a..1469bd4ebe 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg index 1ccbc7a6b8..0e6d0891f5 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg index 3b07d8a368..80414f8e08 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg index 49bc34f08d..a9bdaec137 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg index 7183af5988..af92cfbc1e 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg index 3b8112a811..2da142083b 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg index 4d03dffbde..6c427a7462 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg index 859a323e5c..7fac1c20df 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg index 280b15f6c4..d596e0be91 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg index 33c07215f8..9759f25c94 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg index 0c508a3f08..b7fad60c6e 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg index 21dddc3464..f5ef05d545 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg index 63165e7273..46ecadc9fd 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg index 84b97a64f8..ba20657775 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg index 0cb8a48a4c..18517fda8f 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg index a9eecdd2d0..1450ee19a5 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg index 0f29add9a6..3ab9e3d09e 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg index ebe60424c5..a3fb473056 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg index def2c9f040..384f8ce4c9 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg index 84e900cfb2..6bef3afd95 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg index c3c39e5583..1e5760e696 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg index 3609c38e36..c1fcb2df82 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg index 21c1fa40e9..81323128a0 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg index 4bf94b62c7..95dba27ba6 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg index 9fd80a1cf2..676d7fccf1 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg index 1f8446eddf..31b70a215a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg index 5c54c953f0..869a10fc84 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg index 665bc386d8..2b6c5f2802 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg index 267fba612a..f595418472 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg index e694648f8b..6627f7ad5d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg index 86c8285f3c..d0c434f952 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg index 3a7bc21add..f18e030674 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg index 069c4f294a..d7e6e1239b 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg index 748fb91ef6..0da222d512 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg index a6e78ed4d0..2309c52d5e 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg index a3fdb5af86..540b1e626c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg index fa0ef9e6ec..3b9492443d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg index b454801a5d..aa9ffda827 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg index dc759418d6..94ea7fd6fd 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg index c07ffc43ba..8019801d70 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg index 1337dd5e6a..df9ee716e2 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg index a86c15ef18..96ee57154e 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg index ce36003c4a..bf21301a3a 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg index 2414be591b..22a868aa35 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg index eb5ddb9234..379630d69b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg index efe3f70e6e..573a474625 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg index 9df30cb367..6781558772 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg index 392e5a5675..3876de89db 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg index be28af0c05..e7ba96affc 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg index 05d8b25bbd..3f4b72f6b8 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg index ccb384568d..82466932e1 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg index ecbddfd8b7..001808cb0b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg index 09b6402b55..48a9247e75 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg index 0d5b0891a6..bdfc1c3686 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg index dd59bbc714..cdf652a733 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg index d0a0ebd93e..03b9a4719f 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg index c7c1f97868..d0aa7de952 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG index 5fe7ca919d..e578647355 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index 131e30dc2c..0505c641e7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index 7e8bb6cded..8a00b03d20 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index 616717008c..e4dd05c2af 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg index b93f2fb1b2..19e98fc9a9 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = normal -setting_version = 9 +setting_version = 10 type = quality global_quality = True diff --git a/resources/quality/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg index 3a9315d2b0..eac29a7f37 100644 --- a/resources/quality/ultimaker2/um2_draft.inst.cfg +++ b/resources/quality/ultimaker2/um2_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index be71e79f21..3ed5d7fce7 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index e0b962365a..36bd437dd4 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index f5ebe09cc9..9bf5fefa81 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index 904b7717a9..70d2117568 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index 54bcb0e820..74d6a053a5 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index 7351f481ff..52b8d1968b 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index ca99d9cb70..7f9d854245 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index ad7a8486c4..a52f3a7eaa 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index 1c03350940..7fa5be1218 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index 6ec591f7d3..36b0b64012 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index bf4ffd0ddd..4794f9a743 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index 9676a5d9c6..90c46693e4 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index b4057c5163..b675412d66 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index d1e75bf63c..b485a004f4 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index e1ec57db9d..71df0dee8b 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index ee531a6010..6c6b9335e8 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index da1d5c061f..139c0aca83 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index 8319b00199..ad4473bb66 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index b67b75fa8b..f418184c4e 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 1a5958a844..b667889c1b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 210566c967..741ce4c235 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 984f82f484..d9e5cc3aa6 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index ea19bd0da5..1164125b62 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index 07ad20c568..aba3008932 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index a1a58e4c94..0900da01d0 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index d3940b42bf..e487097807 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index 11e9baedc5..9c68b17d71 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index 484ecbdc3d..9d9912c433 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index b8e4f3920d..685b75b27e 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index 84c537e026..5be0c1cd31 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extracoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg index d71185bf6d..37ba437cfe 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg index 65bdbd53da..29c9cb1626 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg index 118bad3a2e..df50568401 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg index eb85e5352f..6ef155e81d 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index d69ace8ade..744fe1894c 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index 7f6e500b8e..96819d6328 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index 29fa32fd8c..a3cc6ada9f 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index 627e9fe4c5..e53ccbe9b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 55f0b56f19..ddb89bdce1 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index 4fe20aff63..d8734ebacf 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index b1d5f45802..f472a733ed 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index d7f8426e4b..1cb7df97fe 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index 5f1128d8f3..2360a3231b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 02d8af13a1..7f00f1f1b1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 73d6e5b906..4c8c5ce3bf 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 1b033c5452..290cc51900 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index 292820ac2f..7f5825b868 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index fb9e8b9186..cc3b91e406 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 16fe3acbf9..04b4fee95e 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extracoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index 814fa8aa90..f8ea439de1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 0ca13860a1..160a3fc60f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index 1b94a84263..bcc6a8474c 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index f8736a57ef..a83f565043 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index 6c9601f83c..44336d5bed 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index cb9324a8bc..22caf19fb6 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index c171538e81..0b2962cf0d 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = slightlycoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index ad36195c46..24526ead4a 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 1ca9cf3986..e54f936f67 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index a325f9c19b..0369b1fe47 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg index 29376b44bd..0ed746ef26 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index 1e7f093e99..db9ce515cb 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg index 388560565b..7e0c63e2dc 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index 45f69966fb..0f8aebcb82 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg index 18bcf7dda2..310c0dd7c7 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index 955dfe762e..81c74aaba6 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index 1b1e2eb6e2..0cc06b791c 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index 3bbd48ef7a..3e0032cb9f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index 5e19a029c8..6ed89e92f0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index 4698f39137..237f8b2195 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index 81855408da..b6053cab3a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 48b62db6da..af6bcabe3c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 62f189d7e8..b2473e84ad 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index b5be92f483..fe74184e93 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 5844ea869c..6e8125a47b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index 9746160ed0..d92dcee5ef 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index c67ae2b1b7..f9d9270d42 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 1396cbd999..23b54f2d6f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index b50a47a541..11631f1783 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index dbd0959dba..b45973dca2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index e4bac861aa..48c225adf9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index f87342ebaf..9c335fae88 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg index 6627ca84c5..424e888980 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg index bd8d07372d..cc12cd8f47 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg index d55b81bbfd..6bf8b2c6ce 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg index bd0e2992ba..a876f0ccc6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index 3b00f6f734..9c5787429b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 37f32031d1..7623235d28 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 89c61cd46d..7114045a7f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index 16e82835cd..0122914330 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index eb91e8b510..e26fc9400d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index c88f90d9ac..b4ce5c3ad1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index f3ccc5be03..d9fa672e19 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index a99cc80fb0..ca21917b84 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index c82f6bd352..b018f2c8c1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index f7a61111d3..48013bff77 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index a3273ae754..1fe7c7f251 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index 62ac3d8431..f68eb02be0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 193a7486c3..6b3527b2c9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index 00d075dcca..b383fde2e7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index bdd6f1b783..d3af9e7ee0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index a36d6610ca..054d4a38e4 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index f188a539f7..c4b0e7883c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg index f604198f35..957bb0142e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg index f39a988729..ea24b21e27 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg index 6f69ffe06d..e566c87e93 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index ad76f0e0fb..44d3af4a26 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 042d192884..0b28a03dd7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 9deca9d86c..077d0aab45 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index 2e6c308ec5..07f506e019 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index d9e26a3457..ae080455de 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index 34b75c2489..e7141d77ff 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index 80c52719c4..0f2e3c777c 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 47ec05541d..3f5ad363d9 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index bc5b366d2b..ebc02f09f7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 571d7307e4..10104d5aff 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg index f1a329653d..0eeb9de984 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index bd4aabb31d..25a560fa8c 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index f6d6bc620b..2d6d112e95 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 61dfee972b..e714ed4753 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index e197ff962e..3893990f67 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index a803521095..70f5c9c9cf 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index e7ea5cd3d5..c06affc4e1 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index f9011adf6e..81532dfcbc 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index c34b290829..6c5d3baec2 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index c4e2b64222..30e6cb7116 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index f9a27a686f..86f6965eb4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index a35d202b18..9261ecc689 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index f79525f474..e9e111fa47 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 7c16dd48dc..904ffc0854 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index 68322afcac..81c570ec52 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 6a3e774bdd..8a8f0efcd2 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index ba81b5eea5..ab67537b80 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index ffcb251487..c7f41acd06 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 7455df0e00..99a7af36f2 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index c7f99d543f..a6a5ac1a4b 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index a3abfb4da1..24b0f7ba0e 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg index 8d05bc1573..0b9c1d5a61 100644 --- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index 635cdd6bc4..3f470ebaaa 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 2850b3b5b2..28d16285e8 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 972c1226c0..d270ad94b3 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg index 420ac87f2b..b1f3750420 100644 --- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg index 901cb96c08..a567173956 100644 --- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 1cbfa37232..721d867161 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index 72d532927c..3ddb8bf467 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 78d803d83e..31558a9ab7 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg index 56c32c3e61..2cf4d85d27 100644 --- a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index 1cac6cdff7..cf18a6e9b2 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg index 79bb37e301..6820c1cf16 100644 --- a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_original [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index f0b961aba2..051464c6ee 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index 92eed71043..a91783aefd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index 58e480f991..9ff298214a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index 10d08f4c8a..b9f469230e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 5c64c46cd2..c156f3e6b5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 65d11cfe80..4f1dad43b2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index b21230c5c8..1fdee1e826 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 29a2905370..40dff3a7ef 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index cf4f7eaa49..d777592091 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 7125c6a4dc..53295102fc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 16050dac07..6457e0e3ec 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index fa5c2beee0..34e13ba101 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index d17c7f81d2..a18bc574eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index cd7ac0ee60..05cef82f8d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 1112e84381..7d31368bed 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index cbf0abf7dd..418ff7836a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index 62e122afb2..473b03f44b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index 5f27043e05..ddcf1dce03 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index 4fe16c838c..1fd6231274 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index ff07e497e3..ee552da3c2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 3ba2542c60..3256ac1fac 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 8c9d4f1c0f..6267edc26e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index f8b3cf19f6..c935fff0b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index d8ea67b6a6..87ec934e6b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index ec833e9a34..1cd175dc6b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 72a458abd4..7acd1a02ab 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index db69d87ed5..a1ff911104 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 32a63855c3..55433e6784 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index 5d06a8adaf..8127b0994d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index 147a0ecb17..419d530317 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index c1cffb3380..45e501e3a8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 2c21449983..48ae8924eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 30484b2352..f63085ae99 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 9a46bc2714..d049bc0cb9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index ac331659c1..826482e541 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index 003e5b4c04..afa68afab8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 32de8ebfbd..7c334e1fbf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index 9a9c642bae..71d53a70c4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index 7c52a95e05..b3cfaff922 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 8e698c0fa0..42722295dd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 714cf0e203..8958bb144a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index a9e718157a..234556e8a3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 50693b036c..0d3e3133b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 99a702e382..2de1bcd2b2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg index b4d23b1aa0..ec6e79d7e5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg index 97674c7ad2..93d8284be6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg index 5f9bb496e1..347fc338d6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg index 8edf7fb757..c34dd711cf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg index 74405b7b73..a858c1bb83 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg index 99aea4e0b1..f12d62fcbf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg index 51ff55809a..34e0ec37e9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg index 203fdb1c22..c168aa4f09 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg index b10a899f11..104dad4847 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg index 14b7749857..6daecad13d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg index 0d5106fe97..5d315d69c4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg index cb2d43a14f..cae73b1ac9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg index 7384d71110..d8eb03af4c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg index a8c0d0fe1c..67c5218bb4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg index 6856f7c38e..0573f3e687 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg index 0923d26b41..e7c47c0db1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg index 23fa918a33..03d5de33a6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg index 0ffc46daf0..c5f6c5ee1c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg index 40da2d84ae..51cc7acb82 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 2429490e4a..eded05cfb2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 4aa5d702ed..f3fb6ec7b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index 40b58d873c..48a612d57c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 41508dfe6a..2bf9edc3db 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index 02fdb0700c..a69e813ac6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 6b0e439dbe..8f1a865679 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index 4c4ee4171a..e9d099c3b5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index bf93a6ba11..9ebf20ed49 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index ab0ed26a3b..d8226fcd1f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg index 65fd34985f..218e916758 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index 516442778f..ac2aace7c0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 2fa1ab9107..5c8de50af3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 1e1a99c545..a976218220 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index 457b8b4c5d..f964b085e0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index 6918c26882..b95a89aa13 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index f9c548c7f8..6fec3f4589 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index efb8189acd..74d3448cd6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 0299255155..ddb5fadca1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index ac8c2d9190..73de3a8626 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index a986d199e3..9b5c29adcc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index 1bf8b4b9a9..e8df22484c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index b0c627e746..c88a9e6952 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index c0081916c7..fd77a356fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index c246963763..9729e50d88 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 372829bb04..b5959ef77e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 9347331b67..2f9fe4d401 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index f75aed9bf1..9597911a6b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg index 94c1df7ff3..ecc1c245de 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg index f1580c1723..c9a1c5e45e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg index fa5d5af7a2..c40daede80 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg index 7333ecc637..08379f1a3e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg index 8821ca6e05..24d401ae22 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg index b5d07757f5..b5c20fbd13 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg index 07485b146d..2956e42cd4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg index 4a1f125733..5b4e5b7a0b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg index 0c9aedf895..7d1266c5cd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg index 55cdba5d2f..aa65156503 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg index d656c7696d..46dfb3a324 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg index a534ad0a71..d987343aa5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg index d07b85016d..8cac0a388d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg index 7619423618..2b0f026acd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg index dcba5cc7e4..c33a5ccff0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index 2734c80920..f4bbe2c169 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index d8c4d0409b..a9f16a90fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 39f7098128..1456cfc024 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 1a9a6bd3f0..73aee41487 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index 06700548c7..aed9b058e5 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index 89b41cb17e..e6f2ce58f2 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index 635d8a216a..853c5109ef 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index 6529d6d9d5..368243de23 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index 1a8ea47fd9..3ba8e812b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index ad4c342b74..6f3d637fce 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 4df36638d9..d02bb70c68 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index e11e599094..3757863caf 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 0aa2055a6b..400c004d1f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg index 7e306460f5..dd8a4bb853 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 5e9755b22a..9f03aeba67 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index c0bc38fe37..3e1a5dd6ad 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index 270d03f953..22616f7e1c 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg index 3920ec3110..79648c1ad9 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg index 2b6fc62a8b..5996bd2a0c 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg index 16b7d16cff..c8462e47dd 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg index 9214a3d87b..952d09114a 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg index a196259df1..d254da6672 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg index 194508422c..42a1dcd801 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg index 5338c64f2d..8c1f050a1b 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg index 9e1381620f..7cde2b8d48 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg index c702f93ce3..1b0f8549a8 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg index 958f718a45..c4ea9cbd10 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg index 4492c3cb57..cbf1e753df 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg index 62c78aeb7b..faa8425426 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg index 1f22c073a2..2b7bd4b57c 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg index 4759be9be5..9f204106af 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg index 6ed5bba32e..2e19a53295 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg index 0ab58926ce..09ed702c98 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg index 3d0700dc82..49ac5fa45f 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg index 3eebce23f8..54d9c0fe5b 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg index 237345b588..decf10a428 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg index 7ff29e4259..a8f42927ab 100644 --- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg index 56867e8d23..5f3a7cd252 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg index 90f140bbb6..935dc1d127 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg index 9d0d537a12..9214287bf5 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg index 829ef579a5..528d9b5412 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg index c6582c7b35..cfb70fba00 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg index e58143750f..f6fcd371ff 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg index bfda21cb24..79ea633d5b 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg index c50056fb22..4bad7d0a07 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg index bde776a567..f0c1f4ca07 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg index 82a5cb099b..b62c7e4640 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 9cf5e9dd76..1f43e8cdb0 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 7e70c98d17..3449c8931e 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 2fcbf16010..48313f5e41 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.2.inst.cfg b/resources/variants/creality_base_0.2.inst.cfg index 004cb95cd3..3f98c344cd 100644 --- a/resources/variants/creality_base_0.2.inst.cfg +++ b/resources/variants/creality_base_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.3.inst.cfg b/resources/variants/creality_base_0.3.inst.cfg index 7fc9fc9082..8367f9853c 100644 --- a/resources/variants/creality_base_0.3.inst.cfg +++ b/resources/variants/creality_base_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.4.inst.cfg b/resources/variants/creality_base_0.4.inst.cfg index 37560b64cf..40eaf4895d 100644 --- a/resources/variants/creality_base_0.4.inst.cfg +++ b/resources/variants/creality_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.5.inst.cfg b/resources/variants/creality_base_0.5.inst.cfg index 59ea6335c8..48da4008e6 100644 --- a/resources/variants/creality_base_0.5.inst.cfg +++ b/resources/variants/creality_base_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.6.inst.cfg b/resources/variants/creality_base_0.6.inst.cfg index 5b6115a08e..0983c3d4a4 100644 --- a/resources/variants/creality_base_0.6.inst.cfg +++ b/resources/variants/creality_base_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.8.inst.cfg b/resources/variants/creality_base_0.8.inst.cfg index 37dddf4865..31ca8f5a48 100644 --- a/resources/variants/creality_base_0.8.inst.cfg +++ b/resources/variants/creality_base_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_1.0.inst.cfg b/resources/variants/creality_base_1.0.inst.cfg index 284ca1b729..7177a35ec8 100644 --- a/resources/variants/creality_base_1.0.inst.cfg +++ b/resources/variants/creality_base_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.2.inst.cfg b/resources/variants/creality_cr10_0.2.inst.cfg index 7370b87c53..3527e6e44b 100644 --- a/resources/variants/creality_cr10_0.2.inst.cfg +++ b/resources/variants/creality_cr10_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.3.inst.cfg b/resources/variants/creality_cr10_0.3.inst.cfg index 19dcf0a144..ae26fa646d 100644 --- a/resources/variants/creality_cr10_0.3.inst.cfg +++ b/resources/variants/creality_cr10_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.4.inst.cfg b/resources/variants/creality_cr10_0.4.inst.cfg index 01b8427464..643908a4a2 100644 --- a/resources/variants/creality_cr10_0.4.inst.cfg +++ b/resources/variants/creality_cr10_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.5.inst.cfg b/resources/variants/creality_cr10_0.5.inst.cfg index 879796b96a..155206b4de 100644 --- a/resources/variants/creality_cr10_0.5.inst.cfg +++ b/resources/variants/creality_cr10_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.6.inst.cfg b/resources/variants/creality_cr10_0.6.inst.cfg index fa294fd501..50b7ee8420 100644 --- a/resources/variants/creality_cr10_0.6.inst.cfg +++ b/resources/variants/creality_cr10_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.8.inst.cfg b/resources/variants/creality_cr10_0.8.inst.cfg index 5fe5e1a062..9450413cb8 100644 --- a/resources/variants/creality_cr10_0.8.inst.cfg +++ b/resources/variants/creality_cr10_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_1.0.inst.cfg b/resources/variants/creality_cr10_1.0.inst.cfg index 9cb78d057f..20bf3d0231 100644 --- a/resources/variants/creality_cr10_1.0.inst.cfg +++ b/resources/variants/creality_cr10_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.2.inst.cfg b/resources/variants/creality_cr10mini_0.2.inst.cfg index 0a3681a7bc..637b34b5d5 100644 --- a/resources/variants/creality_cr10mini_0.2.inst.cfg +++ b/resources/variants/creality_cr10mini_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.3.inst.cfg b/resources/variants/creality_cr10mini_0.3.inst.cfg index 6175b15f63..834e0d90db 100644 --- a/resources/variants/creality_cr10mini_0.3.inst.cfg +++ b/resources/variants/creality_cr10mini_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.4.inst.cfg b/resources/variants/creality_cr10mini_0.4.inst.cfg index 216458761a..b2d546924c 100644 --- a/resources/variants/creality_cr10mini_0.4.inst.cfg +++ b/resources/variants/creality_cr10mini_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.5.inst.cfg b/resources/variants/creality_cr10mini_0.5.inst.cfg index 0459d56dd9..79deae4686 100644 --- a/resources/variants/creality_cr10mini_0.5.inst.cfg +++ b/resources/variants/creality_cr10mini_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.6.inst.cfg b/resources/variants/creality_cr10mini_0.6.inst.cfg index 59610caaa9..6ba86eee50 100644 --- a/resources/variants/creality_cr10mini_0.6.inst.cfg +++ b/resources/variants/creality_cr10mini_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.8.inst.cfg b/resources/variants/creality_cr10mini_0.8.inst.cfg index d075f36947..fc406c4d53 100644 --- a/resources/variants/creality_cr10mini_0.8.inst.cfg +++ b/resources/variants/creality_cr10mini_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_1.0.inst.cfg b/resources/variants/creality_cr10mini_1.0.inst.cfg index a03b63c400..ae13e6007e 100644 --- a/resources/variants/creality_cr10mini_1.0.inst.cfg +++ b/resources/variants/creality_cr10mini_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.2.inst.cfg b/resources/variants/creality_cr10s4_0.2.inst.cfg index b87abc3174..03bd203fc6 100644 --- a/resources/variants/creality_cr10s4_0.2.inst.cfg +++ b/resources/variants/creality_cr10s4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.3.inst.cfg b/resources/variants/creality_cr10s4_0.3.inst.cfg index af7c52d188..6b18594573 100644 --- a/resources/variants/creality_cr10s4_0.3.inst.cfg +++ b/resources/variants/creality_cr10s4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.4.inst.cfg b/resources/variants/creality_cr10s4_0.4.inst.cfg index 8f31497fa4..7d8484b6a3 100644 --- a/resources/variants/creality_cr10s4_0.4.inst.cfg +++ b/resources/variants/creality_cr10s4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.5.inst.cfg b/resources/variants/creality_cr10s4_0.5.inst.cfg index 7e2a44acf6..95348ba9a8 100644 --- a/resources/variants/creality_cr10s4_0.5.inst.cfg +++ b/resources/variants/creality_cr10s4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.6.inst.cfg b/resources/variants/creality_cr10s4_0.6.inst.cfg index fd6de6f22c..a34f8e7822 100644 --- a/resources/variants/creality_cr10s4_0.6.inst.cfg +++ b/resources/variants/creality_cr10s4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.8.inst.cfg b/resources/variants/creality_cr10s4_0.8.inst.cfg index a0db55ea6d..24d9646fac 100644 --- a/resources/variants/creality_cr10s4_0.8.inst.cfg +++ b/resources/variants/creality_cr10s4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_1.0.inst.cfg b/resources/variants/creality_cr10s4_1.0.inst.cfg index 5dded00f79..81730c7d32 100644 --- a/resources/variants/creality_cr10s4_1.0.inst.cfg +++ b/resources/variants/creality_cr10s4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.2.inst.cfg b/resources/variants/creality_cr10s5_0.2.inst.cfg index a2fe050993..7fc6fe5d25 100644 --- a/resources/variants/creality_cr10s5_0.2.inst.cfg +++ b/resources/variants/creality_cr10s5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.3.inst.cfg b/resources/variants/creality_cr10s5_0.3.inst.cfg index f4e2c282e7..b9c354ef84 100644 --- a/resources/variants/creality_cr10s5_0.3.inst.cfg +++ b/resources/variants/creality_cr10s5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.4.inst.cfg b/resources/variants/creality_cr10s5_0.4.inst.cfg index 5702aad829..b17188b249 100644 --- a/resources/variants/creality_cr10s5_0.4.inst.cfg +++ b/resources/variants/creality_cr10s5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.5.inst.cfg b/resources/variants/creality_cr10s5_0.5.inst.cfg index cf7a0816be..539b55464e 100644 --- a/resources/variants/creality_cr10s5_0.5.inst.cfg +++ b/resources/variants/creality_cr10s5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.6.inst.cfg b/resources/variants/creality_cr10s5_0.6.inst.cfg index e30af712cd..baac6bf9c9 100644 --- a/resources/variants/creality_cr10s5_0.6.inst.cfg +++ b/resources/variants/creality_cr10s5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.8.inst.cfg b/resources/variants/creality_cr10s5_0.8.inst.cfg index 2a473e4e01..428e200113 100644 --- a/resources/variants/creality_cr10s5_0.8.inst.cfg +++ b/resources/variants/creality_cr10s5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_1.0.inst.cfg b/resources/variants/creality_cr10s5_1.0.inst.cfg index b3fab2d1c8..aa15d504ac 100644 --- a/resources/variants/creality_cr10s5_1.0.inst.cfg +++ b/resources/variants/creality_cr10s5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.2.inst.cfg b/resources/variants/creality_cr10s_0.2.inst.cfg index 4990ad0f9c..1a605cca34 100644 --- a/resources/variants/creality_cr10s_0.2.inst.cfg +++ b/resources/variants/creality_cr10s_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.3.inst.cfg b/resources/variants/creality_cr10s_0.3.inst.cfg index bc3c2a0103..4115dbb199 100644 --- a/resources/variants/creality_cr10s_0.3.inst.cfg +++ b/resources/variants/creality_cr10s_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.4.inst.cfg b/resources/variants/creality_cr10s_0.4.inst.cfg index e77e645d65..d75b6a8e47 100644 --- a/resources/variants/creality_cr10s_0.4.inst.cfg +++ b/resources/variants/creality_cr10s_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.5.inst.cfg b/resources/variants/creality_cr10s_0.5.inst.cfg index 14b2741598..e1bec0a62b 100644 --- a/resources/variants/creality_cr10s_0.5.inst.cfg +++ b/resources/variants/creality_cr10s_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.6.inst.cfg b/resources/variants/creality_cr10s_0.6.inst.cfg index ac862aa537..73ec3c2314 100644 --- a/resources/variants/creality_cr10s_0.6.inst.cfg +++ b/resources/variants/creality_cr10s_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.8.inst.cfg b/resources/variants/creality_cr10s_0.8.inst.cfg index fceeee72af..7917b24e4d 100644 --- a/resources/variants/creality_cr10s_0.8.inst.cfg +++ b/resources/variants/creality_cr10s_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_1.0.inst.cfg b/resources/variants/creality_cr10s_1.0.inst.cfg index d687825610..fc1b217ba8 100644 --- a/resources/variants/creality_cr10s_1.0.inst.cfg +++ b/resources/variants/creality_cr10s_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.2.inst.cfg b/resources/variants/creality_cr10spro_0.2.inst.cfg index 8b868d9bd3..0ffded2b21 100644 --- a/resources/variants/creality_cr10spro_0.2.inst.cfg +++ b/resources/variants/creality_cr10spro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.3.inst.cfg b/resources/variants/creality_cr10spro_0.3.inst.cfg index 8c59109a89..eb3308f1c6 100644 --- a/resources/variants/creality_cr10spro_0.3.inst.cfg +++ b/resources/variants/creality_cr10spro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.4.inst.cfg b/resources/variants/creality_cr10spro_0.4.inst.cfg index 48b7ebcff5..bba3818260 100644 --- a/resources/variants/creality_cr10spro_0.4.inst.cfg +++ b/resources/variants/creality_cr10spro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.5.inst.cfg b/resources/variants/creality_cr10spro_0.5.inst.cfg index 40730dc887..e60fbded2d 100644 --- a/resources/variants/creality_cr10spro_0.5.inst.cfg +++ b/resources/variants/creality_cr10spro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.6.inst.cfg b/resources/variants/creality_cr10spro_0.6.inst.cfg index d2d5718878..0912bb7272 100644 --- a/resources/variants/creality_cr10spro_0.6.inst.cfg +++ b/resources/variants/creality_cr10spro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.8.inst.cfg b/resources/variants/creality_cr10spro_0.8.inst.cfg index 5547858975..0e341137de 100644 --- a/resources/variants/creality_cr10spro_0.8.inst.cfg +++ b/resources/variants/creality_cr10spro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_1.0.inst.cfg b/resources/variants/creality_cr10spro_1.0.inst.cfg index 24216c0623..42da705c01 100644 --- a/resources/variants/creality_cr10spro_1.0.inst.cfg +++ b/resources/variants/creality_cr10spro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.2.inst.cfg b/resources/variants/creality_cr20_0.2.inst.cfg index 96d9ae77bd..089f494ee8 100644 --- a/resources/variants/creality_cr20_0.2.inst.cfg +++ b/resources/variants/creality_cr20_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.3.inst.cfg b/resources/variants/creality_cr20_0.3.inst.cfg index e01be6ad6c..226767e273 100644 --- a/resources/variants/creality_cr20_0.3.inst.cfg +++ b/resources/variants/creality_cr20_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.4.inst.cfg b/resources/variants/creality_cr20_0.4.inst.cfg index bddd6189c3..3c926d7b7a 100644 --- a/resources/variants/creality_cr20_0.4.inst.cfg +++ b/resources/variants/creality_cr20_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.5.inst.cfg b/resources/variants/creality_cr20_0.5.inst.cfg index 134c910551..2758eea044 100644 --- a/resources/variants/creality_cr20_0.5.inst.cfg +++ b/resources/variants/creality_cr20_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.6.inst.cfg b/resources/variants/creality_cr20_0.6.inst.cfg index ee941a58a1..3a603c39d6 100644 --- a/resources/variants/creality_cr20_0.6.inst.cfg +++ b/resources/variants/creality_cr20_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.8.inst.cfg b/resources/variants/creality_cr20_0.8.inst.cfg index 5cee2fe2f6..948b21325f 100644 --- a/resources/variants/creality_cr20_0.8.inst.cfg +++ b/resources/variants/creality_cr20_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_1.0.inst.cfg b/resources/variants/creality_cr20_1.0.inst.cfg index e54a553b67..67e5b0f136 100644 --- a/resources/variants/creality_cr20_1.0.inst.cfg +++ b/resources/variants/creality_cr20_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.2.inst.cfg b/resources/variants/creality_cr20pro_0.2.inst.cfg index 90fd1f9b54..19cbd228ab 100644 --- a/resources/variants/creality_cr20pro_0.2.inst.cfg +++ b/resources/variants/creality_cr20pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.3.inst.cfg b/resources/variants/creality_cr20pro_0.3.inst.cfg index 384fb557ad..967360b908 100644 --- a/resources/variants/creality_cr20pro_0.3.inst.cfg +++ b/resources/variants/creality_cr20pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.4.inst.cfg b/resources/variants/creality_cr20pro_0.4.inst.cfg index 6d54a45c53..efda313666 100644 --- a/resources/variants/creality_cr20pro_0.4.inst.cfg +++ b/resources/variants/creality_cr20pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.5.inst.cfg b/resources/variants/creality_cr20pro_0.5.inst.cfg index 042795a675..64f84ed545 100644 --- a/resources/variants/creality_cr20pro_0.5.inst.cfg +++ b/resources/variants/creality_cr20pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.6.inst.cfg b/resources/variants/creality_cr20pro_0.6.inst.cfg index a04b4180bf..835ad2a9e0 100644 --- a/resources/variants/creality_cr20pro_0.6.inst.cfg +++ b/resources/variants/creality_cr20pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.8.inst.cfg b/resources/variants/creality_cr20pro_0.8.inst.cfg index fc6c24f9af..d7447bbecf 100644 --- a/resources/variants/creality_cr20pro_0.8.inst.cfg +++ b/resources/variants/creality_cr20pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_1.0.inst.cfg b/resources/variants/creality_cr20pro_1.0.inst.cfg index 8a038ec80e..47c7270add 100644 --- a/resources/variants/creality_cr20pro_1.0.inst.cfg +++ b/resources/variants/creality_cr20pro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.2.inst.cfg b/resources/variants/creality_ender2_0.2.inst.cfg index 0170b6b05f..8f9373b263 100644 --- a/resources/variants/creality_ender2_0.2.inst.cfg +++ b/resources/variants/creality_ender2_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.3.inst.cfg b/resources/variants/creality_ender2_0.3.inst.cfg index 3a5c1429e8..496dca9ef4 100644 --- a/resources/variants/creality_ender2_0.3.inst.cfg +++ b/resources/variants/creality_ender2_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.4.inst.cfg b/resources/variants/creality_ender2_0.4.inst.cfg index 1d6b9d5574..0891305806 100644 --- a/resources/variants/creality_ender2_0.4.inst.cfg +++ b/resources/variants/creality_ender2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.5.inst.cfg b/resources/variants/creality_ender2_0.5.inst.cfg index 514f505cba..fde911dd24 100644 --- a/resources/variants/creality_ender2_0.5.inst.cfg +++ b/resources/variants/creality_ender2_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.6.inst.cfg b/resources/variants/creality_ender2_0.6.inst.cfg index e59a2915a5..dcf676920c 100644 --- a/resources/variants/creality_ender2_0.6.inst.cfg +++ b/resources/variants/creality_ender2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.8.inst.cfg b/resources/variants/creality_ender2_0.8.inst.cfg index 9fa11776d9..5532a65f19 100644 --- a/resources/variants/creality_ender2_0.8.inst.cfg +++ b/resources/variants/creality_ender2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_1.0.inst.cfg b/resources/variants/creality_ender2_1.0.inst.cfg index d4d369cbd3..25f195e41b 100644 --- a/resources/variants/creality_ender2_1.0.inst.cfg +++ b/resources/variants/creality_ender2_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.2.inst.cfg b/resources/variants/creality_ender3_0.2.inst.cfg index 3edd719430..3cdd7e7c93 100644 --- a/resources/variants/creality_ender3_0.2.inst.cfg +++ b/resources/variants/creality_ender3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.3.inst.cfg b/resources/variants/creality_ender3_0.3.inst.cfg index d6912da402..9da7afd758 100644 --- a/resources/variants/creality_ender3_0.3.inst.cfg +++ b/resources/variants/creality_ender3_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.4.inst.cfg b/resources/variants/creality_ender3_0.4.inst.cfg index 5d203983a8..a87c6d77bd 100644 --- a/resources/variants/creality_ender3_0.4.inst.cfg +++ b/resources/variants/creality_ender3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.5.inst.cfg b/resources/variants/creality_ender3_0.5.inst.cfg index c662924f9f..040502a921 100644 --- a/resources/variants/creality_ender3_0.5.inst.cfg +++ b/resources/variants/creality_ender3_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.6.inst.cfg b/resources/variants/creality_ender3_0.6.inst.cfg index d43d774a5e..d161652a79 100644 --- a/resources/variants/creality_ender3_0.6.inst.cfg +++ b/resources/variants/creality_ender3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.8.inst.cfg b/resources/variants/creality_ender3_0.8.inst.cfg index 8880e0cd52..ce9947642e 100644 --- a/resources/variants/creality_ender3_0.8.inst.cfg +++ b/resources/variants/creality_ender3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_1.0.inst.cfg b/resources/variants/creality_ender3_1.0.inst.cfg index 8a623b6ccd..cf6c6ed752 100644 --- a/resources/variants/creality_ender3_1.0.inst.cfg +++ b/resources/variants/creality_ender3_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.2.inst.cfg b/resources/variants/creality_ender4_0.2.inst.cfg index 67ad758196..f6e7372c1a 100644 --- a/resources/variants/creality_ender4_0.2.inst.cfg +++ b/resources/variants/creality_ender4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.3.inst.cfg b/resources/variants/creality_ender4_0.3.inst.cfg index a8052a2cfd..644fa86c25 100644 --- a/resources/variants/creality_ender4_0.3.inst.cfg +++ b/resources/variants/creality_ender4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.4.inst.cfg b/resources/variants/creality_ender4_0.4.inst.cfg index 779ddab657..1949813c36 100644 --- a/resources/variants/creality_ender4_0.4.inst.cfg +++ b/resources/variants/creality_ender4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.5.inst.cfg b/resources/variants/creality_ender4_0.5.inst.cfg index 9a24bd1971..8b4a83e187 100644 --- a/resources/variants/creality_ender4_0.5.inst.cfg +++ b/resources/variants/creality_ender4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.6.inst.cfg b/resources/variants/creality_ender4_0.6.inst.cfg index 93ff84b362..6961a6d314 100644 --- a/resources/variants/creality_ender4_0.6.inst.cfg +++ b/resources/variants/creality_ender4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.8.inst.cfg b/resources/variants/creality_ender4_0.8.inst.cfg index 1a9218426b..1499efa525 100644 --- a/resources/variants/creality_ender4_0.8.inst.cfg +++ b/resources/variants/creality_ender4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_1.0.inst.cfg b/resources/variants/creality_ender4_1.0.inst.cfg index a21a9c9c90..446907a101 100644 --- a/resources/variants/creality_ender4_1.0.inst.cfg +++ b/resources/variants/creality_ender4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.2.inst.cfg b/resources/variants/creality_ender5_0.2.inst.cfg index da77f28389..df6f83c34c 100644 --- a/resources/variants/creality_ender5_0.2.inst.cfg +++ b/resources/variants/creality_ender5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.3.inst.cfg b/resources/variants/creality_ender5_0.3.inst.cfg index 82672c5074..2b44699709 100644 --- a/resources/variants/creality_ender5_0.3.inst.cfg +++ b/resources/variants/creality_ender5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.4.inst.cfg b/resources/variants/creality_ender5_0.4.inst.cfg index 4b5046eb15..f5b4c0f06d 100644 --- a/resources/variants/creality_ender5_0.4.inst.cfg +++ b/resources/variants/creality_ender5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.5.inst.cfg b/resources/variants/creality_ender5_0.5.inst.cfg index 635bc95139..773ec1c80d 100644 --- a/resources/variants/creality_ender5_0.5.inst.cfg +++ b/resources/variants/creality_ender5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.6.inst.cfg b/resources/variants/creality_ender5_0.6.inst.cfg index 601682ee2d..e32cb3db8b 100644 --- a/resources/variants/creality_ender5_0.6.inst.cfg +++ b/resources/variants/creality_ender5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.8.inst.cfg b/resources/variants/creality_ender5_0.8.inst.cfg index f9b684d87f..329b3f03bc 100644 --- a/resources/variants/creality_ender5_0.8.inst.cfg +++ b/resources/variants/creality_ender5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_1.0.inst.cfg b/resources/variants/creality_ender5_1.0.inst.cfg index 0da86b8aea..fdbb2bdeaf 100644 --- a/resources/variants/creality_ender5_1.0.inst.cfg +++ b/resources/variants/creality_ender5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_025_e3d.inst.cfg b/resources/variants/deltacomb_025_e3d.inst.cfg index 54e21992db..1685ddacab 100755 --- a/resources/variants/deltacomb_025_e3d.inst.cfg +++ b/resources/variants/deltacomb_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_040_e3d.inst.cfg b/resources/variants/deltacomb_040_e3d.inst.cfg index ab6a6eeb3f..e3b1c2c5bb 100755 --- a/resources/variants/deltacomb_040_e3d.inst.cfg +++ b/resources/variants/deltacomb_040_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_080_e3d.inst.cfg b/resources/variants/deltacomb_080_e3d.inst.cfg index 367256cd5f..bd24120ba3 100755 --- a/resources/variants/deltacomb_080_e3d.inst.cfg +++ b/resources/variants/deltacomb_080_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg index ca1a24cc79..5dff2c12d5 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum_hyb35.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg index fddbd77db8..ba57935fc6 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum_lite04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg index 000ae9d463..573cee1af3 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum_lite06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg index f1bb4b076f..26f5febec3 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum_pro02.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg index dca6a813a7..a6d9043808 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum_pro04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg index dd642e7228..8ae1698831 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum_pro06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg index a1bda5a50b..1d5d3d2528 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum_pro08.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/felixpro2_0.25.inst.cfg b/resources/variants/felixpro2_0.25.inst.cfg index 9eb89502b6..9359da0bc0 100644 --- a/resources/variants/felixpro2_0.25.inst.cfg +++ b/resources/variants/felixpro2_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.35.inst.cfg b/resources/variants/felixpro2_0.35.inst.cfg index a4d0848f63..3572fce149 100644 --- a/resources/variants/felixpro2_0.35.inst.cfg +++ b/resources/variants/felixpro2_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.50.inst.cfg b/resources/variants/felixpro2_0.50.inst.cfg index 2c7ff3bb6c..d390d22ba9 100644 --- a/resources/variants/felixpro2_0.50.inst.cfg +++ b/resources/variants/felixpro2_0.50.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.70.inst.cfg b/resources/variants/felixpro2_0.70.inst.cfg index b5de103f9d..40ca526023 100644 --- a/resources/variants/felixpro2_0.70.inst.cfg +++ b/resources/variants/felixpro2_0.70.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felixtec4_0.25.inst.cfg index f49119f0e6..a95f96feea 100644 --- a/resources/variants/felixtec4_0.25.inst.cfg +++ b/resources/variants/felixtec4_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felixtec4_0.35.inst.cfg index f65128f518..fadd19bed7 100644 --- a/resources/variants/felixtec4_0.35.inst.cfg +++ b/resources/variants/felixtec4_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 9 +setting_version = 10 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felixtec4_0.50.inst.cfg index e17abdc704..98bc237c18 100644 --- a/resources/variants/felixtec4_0.50.inst.cfg +++ b/resources/variants/felixtec4_0.50.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 9 +setting_version = 10 [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felixtec4_0.70.inst.cfg index ecd61db3d1..6a731870a9 100644 --- a/resources/variants/felixtec4_0.70.inst.cfg +++ b/resources/variants/felixtec4_0.70.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 9 +setting_version = 10 [values] machine_nozzle_size = 0.70 diff --git a/resources/variants/gmax15plus_025_e3d.inst.cfg b/resources/variants/gmax15plus_025_e3d.inst.cfg index cdef6f5b53..4bf7b7765e 100644 --- a/resources/variants/gmax15plus_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_04_e3d.inst.cfg b/resources/variants/gmax15plus_04_e3d.inst.cfg index 0b059c4789..a4cc8e8db9 100644 --- a/resources/variants/gmax15plus_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_e3d.inst.cfg b/resources/variants/gmax15plus_05_e3d.inst.cfg index 311901cf67..0269c03480 100644 --- a/resources/variants/gmax15plus_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_jhead.inst.cfg b/resources/variants/gmax15plus_05_jhead.inst.cfg index c992bc1f4a..909cf7386e 100644 --- a/resources/variants/gmax15plus_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_06_e3d.inst.cfg b/resources/variants/gmax15plus_06_e3d.inst.cfg index 10a2669565..266b45d25c 100644 --- a/resources/variants/gmax15plus_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_08_e3d.inst.cfg b/resources/variants/gmax15plus_08_e3d.inst.cfg index 0138e70b29..11f5e2f608 100644 --- a/resources/variants/gmax15plus_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_10_jhead.inst.cfg b/resources/variants/gmax15plus_10_jhead.inst.cfg index 8ba03ec144..688add6c34 100644 --- a/resources/variants/gmax15plus_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_12_e3d.inst.cfg b/resources/variants/gmax15plus_12_e3d.inst.cfg index bc178ec11d..357aaed672 100644 --- a/resources/variants/gmax15plus_12_e3d.inst.cfg +++ b/resources/variants/gmax15plus_12_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg index 322558033c..a04b5cc8be 100644 --- a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg index 35cf37b345..facedf04a6 100644 --- a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg index 39a060108d..7d866b19d0 100644 --- a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg index fdd41236ee..7824d1dfd8 100644 --- a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg index 8de26fb19e..1cbc7ecbfc 100644 --- a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg index df315665dc..6756e64862 100644 --- a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg index bfd8c8cadf..95f347ec0e 100644 --- a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.25tpnozzle.inst.cfg b/resources/variants/hms434_0.25tpnozzle.inst.cfg index d405652432..19421ef587 100644 --- a/resources/variants/hms434_0.25tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.25tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434_0.4tpnozzle.inst.cfg index 3ec9bd00d1..20f2ca808a 100644 --- a/resources/variants/hms434_0.4tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.4tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.6tpnozzle.inst.cfg b/resources/variants/hms434_0.6tpnozzle.inst.cfg index 48e0e1017c..a57385f31b 100644 --- a/resources/variants/hms434_0.6tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.6tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434_0.8tpnozzle.inst.cfg index d11eb0959a..076412b8bb 100644 --- a/resources/variants/hms434_0.8tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.8tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_1.2tpnozzle.inst.cfg b/resources/variants/hms434_1.2tpnozzle.inst.cfg index 0e0bca7bd5..ce63070b40 100644 --- a/resources/variants/hms434_1.2tpnozzle.inst.cfg +++ b/resources/variants/hms434_1.2tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_1.5tpnozzle.inst.cfg b/resources/variants/hms434_1.5tpnozzle.inst.cfg index 290a968cd4..ba5eb263dc 100644 --- a/resources/variants/hms434_1.5tpnozzle.inst.cfg +++ b/resources/variants/hms434_1.5tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg index 3ab33b561e..2278bd8471 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox [metadata] author = IMADE3D -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg index f9e09beabe..4220d3d141 100644 --- a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox_2 [metadata] author = IMADE3D -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d_a31_04.inst.cfg index 7a6544200a..a18911507f 100644 --- a/resources/variants/nwa3d_a31_04.inst.cfg +++ b/resources/variants/nwa3d_a31_04.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d_a31_06.inst.cfg index afbece180a..e96ebf2014 100644 --- a/resources/variants/nwa3d_a31_06.inst.cfg +++ b/resources/variants/nwa3d_a31_06.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg index ee249049d8..29cd075177 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg index 5458f1f7cb..b4618f2bd8 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index 5425f0a762..8b2daab709 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index f4cb256bb0..06836d8d67 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index 5b14aaa5dc..11df55d473 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index cffbffd9c9..bbf9c14afa 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index 0726cf860a..6da3a58b8f 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index 240568ad9a..6e0a9d89e6 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index 3c6d63219c..b5faa591d9 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.2.inst.cfg b/resources/variants/tizyx_evy_0.2.inst.cfg index b9ec0434b4..4b17b4504e 100644 --- a/resources/variants/tizyx_evy_0.2.inst.cfg +++ b/resources/variants/tizyx_evy_0.2.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.3.inst.cfg b/resources/variants/tizyx_evy_0.3.inst.cfg index 9f84898897..e99fba1f35 100644 --- a/resources/variants/tizyx_evy_0.3.inst.cfg +++ b/resources/variants/tizyx_evy_0.3.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.4.inst.cfg b/resources/variants/tizyx_evy_0.4.inst.cfg index 7499a20f27..bc8b2d4506 100644 --- a/resources/variants/tizyx_evy_0.4.inst.cfg +++ b/resources/variants/tizyx_evy_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.5.inst.cfg b/resources/variants/tizyx_evy_0.5.inst.cfg index 095b67615d..1b6b543928 100644 --- a/resources/variants/tizyx_evy_0.5.inst.cfg +++ b/resources/variants/tizyx_evy_0.5.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.6.inst.cfg b/resources/variants/tizyx_evy_0.6.inst.cfg index badb7a5089..4b4a7f9bfa 100644 --- a/resources/variants/tizyx_evy_0.6.inst.cfg +++ b/resources/variants/tizyx_evy_0.6.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.8.inst.cfg b/resources/variants/tizyx_evy_0.8.inst.cfg index 7ec7779605..8f60c8fee8 100644 --- a/resources/variants/tizyx_evy_0.8.inst.cfg +++ b/resources/variants/tizyx_evy_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_1.0.inst.cfg b/resources/variants/tizyx_evy_1.0.inst.cfg index f5e18bb63d..000a99da83 100644 --- a/resources/variants/tizyx_evy_1.0.inst.cfg +++ b/resources/variants/tizyx_evy_1.0.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_classic.inst.cfg b/resources/variants/tizyx_evy_dual_classic.inst.cfg index 85ed07f803..3aec98dbd5 100644 --- a/resources/variants/tizyx_evy_dual_classic.inst.cfg +++ b/resources/variants/tizyx_evy_dual_classic.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg index 58633891a9..e5a4d1968b 100644 --- a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg +++ b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx_k25_0.2.inst.cfg index 159423a0ad..7e47eade66 100644 --- a/resources/variants/tizyx_k25_0.2.inst.cfg +++ b/resources/variants/tizyx_k25_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx_k25_0.3.inst.cfg index 8689aedd23..eb16b525c0 100644 --- a/resources/variants/tizyx_k25_0.3.inst.cfg +++ b/resources/variants/tizyx_k25_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx_k25_0.4.inst.cfg index c923013ea6..efcaa8d51f 100644 --- a/resources/variants/tizyx_k25_0.4.inst.cfg +++ b/resources/variants/tizyx_k25_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx_k25_0.5.inst.cfg index de563f5983..ee74d24961 100644 --- a/resources/variants/tizyx_k25_0.5.inst.cfg +++ b/resources/variants/tizyx_k25_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx_k25_0.6.inst.cfg index 0f4dac9152..ad2bb9f9c9 100644 --- a/resources/variants/tizyx_k25_0.6.inst.cfg +++ b/resources/variants/tizyx_k25_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx_k25_0.8.inst.cfg index 64053da2b8..05126457ee 100644 --- a/resources/variants/tizyx_k25_0.8.inst.cfg +++ b/resources/variants/tizyx_k25_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx_k25_1.0.inst.cfg index 6b32885c0c..065ca23cfb 100644 --- a/resources/variants/tizyx_k25_1.0.inst.cfg +++ b/resources/variants/tizyx_k25_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_0.25.inst.cfg index a844b28ad7..6e2446a0ea 100644 --- a/resources/variants/ultimaker2_0.25.inst.cfg +++ b/resources/variants/ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_0.4.inst.cfg index 4f66962a7c..d44af57513 100644 --- a/resources/variants/ultimaker2_0.4.inst.cfg +++ b/resources/variants/ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_0.6.inst.cfg index 2b73baf1ad..3d76193a81 100644 --- a/resources/variants/ultimaker2_0.6.inst.cfg +++ b/resources/variants/ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_0.8.inst.cfg index 70bdc42b35..43491d656c 100644 --- a/resources/variants/ultimaker2_0.8.inst.cfg +++ b/resources/variants/ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.25.inst.cfg b/resources/variants/ultimaker2_extended_0.25.inst.cfg index bbf48cd4a9..e1ee26fe52 100644 --- a/resources/variants/ultimaker2_extended_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.4.inst.cfg b/resources/variants/ultimaker2_extended_0.4.inst.cfg index 18a42a6348..3e008cc4c4 100644 --- a/resources/variants/ultimaker2_extended_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.6.inst.cfg b/resources/variants/ultimaker2_extended_0.6.inst.cfg index 25e5b07239..8cde95416a 100644 --- a/resources/variants/ultimaker2_extended_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.8.inst.cfg b/resources/variants/ultimaker2_extended_0.8.inst.cfg index 4cfae93064..b1d6acb100 100644 --- a/resources/variants/ultimaker2_extended_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index 6942ea9258..374ed2120a 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index c7c2b8a0d7..66aaf862fa 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index ca167687a8..3dc24ea7f8 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index e398d30afb..9179cd2249 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index bbb9e2557c..938e17335d 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index 596954f9b2..cb7d2bf54b 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index d930c1ccdb..4a2523fca1 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index e07db58e75..09ad29e698 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index 61b0be3943..fe7f3a3d48 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 2d1547bc43..18653c0973 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 68edd4dbe7..ddfb5f5415 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 7ad1cef66a..0801816a60 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 0e06101c2a..6929f72e0a 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index b85e4d6211..78e1e90e41 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 9813695402..60396f6fef 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index 22db68acba..97a4580117 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index fd596bec60..b57a3b221e 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index 75d9655eb2..b5fcecebf6 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 6238c92b6c..c7c909eded 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 8fa9158310..95de63a4d0 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index b9c4f32afb..542ffbe007 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aluminum.inst.cfg b/resources/variants/ultimaker_s5_aluminum.inst.cfg index fd712935e7..27e19f5016 100644 --- a/resources/variants/ultimaker_s5_aluminum.inst.cfg +++ b/resources/variants/ultimaker_s5_aluminum.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = buildplate diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index e8bc4f1523..1e9f25546c 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 754b681138..44971fa47d 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index b252f1e12f..4a8cac944f 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg index 7cf673cb57..9e97939bff 100644 --- a/resources/variants/ultimaker_s5_glass.inst.cfg +++ b/resources/variants/ultimaker_s5_glass.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = buildplate From 7d8911b74d76deb9630536c8ed2189e5d31c689b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 Sep 2019 11:41:42 +0200 Subject: [PATCH 386/994] Fix version upgrade for stacks CURA-6599 --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 3 --- plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 0bf0073d73..38dd232980 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -5,8 +5,6 @@ from UM.VersionUpgrade import VersionUpgrade class VersionUpgrade43to44(VersionUpgrade): - pass - def getCfgVersion(self, serialised: str) -> int: parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) @@ -50,7 +48,6 @@ class VersionUpgrade43to44(VersionUpgrade): # Update version number. parser["metadata"]["setting_version"] = "10" - parser["general"]["version"] = "5" # We should only have 6 levels when we start. assert "7" not in parser["containers"] diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py b/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py index 53319197e1..411a75d385 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py @@ -17,8 +17,8 @@ def getMetaData() -> Dict[str, Any]: "version_upgrade": { # From To Upgrade function ("preferences", 6000009): ("preferences", 6000010, upgrade.upgradePreferences), - ("machine_stack", 4000009): ("machine_stack", 5000010, upgrade.upgradeStack), - ("extruder_train", 4000009): ("extruder_train", 5000010, upgrade.upgradeStack), + ("machine_stack", 4000009): ("machine_stack", 4000010, upgrade.upgradeStack), + ("extruder_train", 4000009): ("extruder_train", 4000010, upgrade.upgradeStack), ("definition_changes", 4000009): ("definition_changes", 4000010, upgrade.upgradeInstanceContainer), ("quality_changes", 4000009): ("quality_changes", 4000010, upgrade.upgradeInstanceContainer), ("quality", 4000009): ("quality", 4000010, upgrade.upgradeInstanceContainer), From ef8b9e98d1a8a88d17d40e66bae028044738af6f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 14:47:36 +0200 Subject: [PATCH 387/994] Remove calls to quality manager's private functions It should never have been called that way. Contributes to issue CURA-6600. --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 64 +++++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index c9efc37bb5..00d7252875 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -1,10 +1,10 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from configparser import ConfigParser import zipfile import os -from typing import Dict, List, Tuple, cast +from typing import cast, Dict, List, Optional, Tuple import xml.etree.ElementTree as ET @@ -23,8 +23,8 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.Job import Job from UM.Preferences import Preferences -from cura.Machines.ContainerTree import ContainerTree +from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType from cura.Settings.CuraStackBuilder import CuraStackBuilder from cura.Settings.ExtruderManager import ExtruderManager @@ -42,7 +42,7 @@ i18n_catalog = i18nCatalog("cura") class ContainerInfo: - def __init__(self, file_name: str, serialized: str, parser: ConfigParser) -> None: + def __init__(self, file_name: Optional[str], serialized: Optional[str], parser: Optional[ConfigParser]) -> None: self.file_name = file_name self.serialized = serialized self.parser = parser @@ -579,9 +579,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): signals = [container_registry.containerAdded, container_registry.containerRemoved, container_registry.containerMetaDataChanged] - # - # We now have different managers updating their lookup tables upon container changes. It is critical to make - # sure that the managers have a complete set of data when they update. + # The container tree updates its lookup tables upon container changes. + # It is critical to make sure that it has a complete set of data when it + # updates. # # In project loading, lots of the container-related signals are loosely emitted, which can create timing gaps # for incomplete data update or other kinds of issues to happen. @@ -747,7 +747,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): return application = CuraApplication.getInstance() - quality_manager = application.getQualityManager() # If we have custom profiles, load them quality_changes_name = self._machine_info.quality_changes_info.name @@ -773,11 +772,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_stack = None if position is not None: extruder_stack = global_stack.extruders[position] - container = quality_manager._createQualityChanges(quality_changes_quality_type, - quality_changes_name, - global_stack, extruder_stack) + container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) container_info.container = container - container.setDirty(True) self._container_registry.addContainer(container) Logger.log("d", "Created new quality changes container [%s]", container.getId()) @@ -806,10 +802,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack) extruder_stack = global_stack.extruders["0"] - container = quality_manager._createQualityChanges(quality_changes_quality_type, quality_changes_name, - global_stack, extruder_stack) + container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) container_info.container = container - container.setDirty(True) self._container_registry.addContainer(container) Logger.log("d", "Created new quality changes container [%s]", container.getId()) @@ -835,10 +829,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if container_info.container is None: extruder_stack = global_stack.extruders[position] - container = quality_manager._createQualityChanges(quality_changes_quality_type, quality_changes_name, - global_stack, extruder_stack) + container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) container_info.container = container - container.setDirty(True) self._container_registry.addContainer(container) for key, value in container_info.parser["values"].items(): @@ -846,6 +838,42 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._machine_info.quality_changes_info.name = quality_changes_name + ## Helper class to create a new quality changes profile. + # + # This will then later be filled with the appropriate data. + # \param quality_type The quality type of the new profile. + # \param name The name for the profile. This will later be made unique so + # it doesn't need to be unique yet. + # \param global_stack The global stack showing the configuration that the + # profile should be created for. + # \param extruder_stack The extruder stack showing the configuration that + # the profile should be created for. If this is None, it will be created + # for the global stack. + def _createNewQualityChanges(self, quality_type: str, name: str, global_stack: GlobalStack, extruder_stack: Optional[ExtruderStack]) -> InstanceContainer: + container_registry = CuraApplication.getInstance().getContainerRegistry() + base_id = global_stack.definition.getId() if extruder_stack is None else extruder_stack.getId() + new_id = base_id + "_" + name + new_id = new_id.lower().replace(" ", "_") + new_id = container_registry.uniqueName(new_id) + + # Create a new quality_changes container for the quality. + quality_changes = InstanceContainer(new_id) + quality_changes.setName(name) + quality_changes.setMetaDataEntry("type", "quality_changes") + quality_changes.setMetaDataEntry("quality_type", quality_type) + + # If we are creating a container for an extruder, ensure we add that to the container. + if extruder_stack is not None: + quality_changes.setMetaDataEntry("position", extruder_stack.getMetaDataEntry("position")) + + # If the machine specifies qualities should be filtered, ensure we match the current criteria. + machine_definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition + quality_changes.setDefinition(machine_definition_id) + + quality_changes.setMetaDataEntry("setting_version", CuraApplication.getInstance().SettingVersion) + quality_changes.setDirty(True) + return quality_changes + @staticmethod def _clearStack(stack): application = CuraApplication.getInstance() From 0d68381e612b758c9c458303829b211b78247904 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 14:52:51 +0200 Subject: [PATCH 388/994] Code style: brackets on new line Contributes to issue CURA-6600. --- resources/qml/Preferences/ProfilesPage.qml | 105 ++++++++++++++------- 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 56fdd570a8..4d766e6618 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -21,9 +21,11 @@ Item UM.I18nCatalog { id: catalog; name: "cura"; } - Label { + Label + { id: titleLabel - anchors { + anchors + { top: parent.top left: parent.left right: parent.right @@ -35,28 +37,33 @@ Item property var hasCurrentItem: base.currentItem != null - property var currentItem: { + property var currentItem: + { var current_index = qualityListView.currentIndex; return (current_index == -1) ? null : base.qualityManagementModel.getItem(current_index); } property var currentItemName: hasCurrentItem ? base.currentItem.name : "" - property var isCurrentItemActivated: { - if (!base.currentItem) { + property var isCurrentItemActivated: + { + if (!base.currentItem) + { return false; } return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName; } - property var canCreateProfile: { + property var canCreateProfile: + { return isCurrentItemActivated && Cura.MachineManager.hasUserSettings; } Row // Button Row { id: buttonRow - anchors { + anchors + { left: parent.left right: parent.right top: titleLabel.bottom @@ -70,10 +77,14 @@ Item text: catalog.i18nc("@action:button", "Activate") iconName: "list-activate" enabled: !isCurrentItemActivated - onClicked: { - if (base.currentItem.is_read_only) { + onClicked: + { + if (base.currentItem.is_read_only) + { Cura.MachineManager.setQualityGroup(base.currentItem.quality_group); - } else { + } + else + { Cura.MachineManager.setQualityChangesGroup(base.currentItem.quality_changes_group); } } @@ -88,7 +99,8 @@ Item enabled: base.canCreateProfile && !Cura.MachineManager.stacksHaveErrors visible: base.canCreateProfile - onClicked: { + onClicked: + { createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name); createQualityDialog.open(); createQualityDialog.selectText(); @@ -104,7 +116,8 @@ Item enabled: !base.canCreateProfile visible: !base.canCreateProfile - onClicked: { + onClicked: + { duplicateQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name); duplicateQualityDialog.open(); duplicateQualityDialog.selectText(); @@ -118,7 +131,8 @@ Item text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated - onClicked: { + onClicked: + { forceActiveFocus(); confirmRemoveQualityDialog.open(); } @@ -131,7 +145,8 @@ Item text: catalog.i18nc("@action:button", "Rename") iconName: "edit-rename" enabled: base.hasCurrentItem && !base.currentItem.is_read_only - onClicked: { + onClicked: + { renameQualityDialog.object = base.currentItem.name; renameQualityDialog.open(); renameQualityDialog.selectText(); @@ -144,7 +159,8 @@ Item id: importMenuButton text: catalog.i18nc("@action:button", "Import") iconName: "document-import" - onClicked: { + onClicked: + { importDialog.open(); } } @@ -156,7 +172,8 @@ Item text: catalog.i18nc("@action:button", "Export") iconName: "document-export" enabled: base.hasCurrentItem && !base.currentItem.is_read_only - onClicked: { + onClicked: + { exportDialog.open(); } } @@ -285,13 +302,16 @@ Item { var result = Cura.ContainerManager.importProfile(fileUrl); messageDialog.text = result.message; - if (result.status == "ok") { + if (result.status == "ok") + { messageDialog.icon = StandardIcon.Information; } - else if (result.status == "duplicate") { + else if (result.status == "duplicate") + { messageDialog.icon = StandardIcon.Warning; } - else { + else + { messageDialog.icon = StandardIcon.Critical; } messageDialog.open(); @@ -312,7 +332,8 @@ Item var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group, fileUrl, selectedNameFilter); - if (result && result.status == "error") { + if (result && result.status == "error") + { messageDialog.icon = StandardIcon.Critical; messageDialog.text = result.message; messageDialog.open(); @@ -323,10 +344,12 @@ Item } } - Item { + Item + { id: contentsItem - anchors { + anchors + { top: titleLabel.bottom left: parent.left right: parent.right @@ -340,7 +363,8 @@ Item Item { - anchors { + anchors + { top: buttonRow.bottom topMargin: UM.Theme.getSize("default_margin").height left: parent.left @@ -348,12 +372,16 @@ Item bottom: parent.bottom } - SystemPalette { id: palette } + SystemPalette + { + id: palette + } Label { id: captionLabel - anchors { + anchors + { top: parent.top left: parent.left } @@ -366,14 +394,16 @@ Item ScrollView { id: profileScrollView - anchors { + anchors + { top: captionLabel.visible ? captionLabel.bottom : parent.top topMargin: captionLabel.visible ? UM.Theme.getSize("default_margin").height : 0 bottom: parent.bottom left: parent.left } - Rectangle { + Rectangle + { parent: viewport anchors.fill: parent color: palette.light @@ -445,7 +475,8 @@ Item MouseArea { anchors.fill: parent - onClicked: { + onClicked: + { parent.ListView.view.currentIndex = model.index; } } @@ -458,7 +489,8 @@ Item { id: detailsPanel - anchors { + anchors + { left: profileScrollView.right leftMargin: UM.Theme.getSize("default_margin").width top: parent.top @@ -478,13 +510,15 @@ Item width: parent.width height: childrenRect.height - Label { + Label + { text: base.currentItemName font: UM.Theme.getFont("large_bold") } } - Flow { + Flow + { id: currentSettingsActions visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName anchors.left: parent.left @@ -507,7 +541,8 @@ Item } } - Column { + Column + { id: profileNotices anchors.top: currentSettingsActions.visible ? currentSettingsActions.bottom : currentSettingsActions.anchors.top anchors.topMargin: UM.Theme.getSize("default_margin").height @@ -515,14 +550,16 @@ Item anchors.right: parent.right spacing: UM.Theme.getSize("default_margin").height - Label { + Label + { id: defaultsMessage visible: false text: catalog.i18nc("@action:label", "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below.") wrapMode: Text.WordWrap width: parent.width } - Label { + Label + { id: noCurrentSettingsMessage visible: base.isCurrentItemActivated && !Cura.MachineManager.hasUserSettings text: catalog.i18nc("@action:label", "Your current settings match the selected profile.") From 47e1dbe38da3d1b4acedc72274d3a70622309815 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 14:55:32 +0200 Subject: [PATCH 389/994] Remove usage of Quality Manager This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest. Contributes to issue CURA-6600. --- resources/qml/Preferences/ProfilesPage.qml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 4d766e6618..d620c1a37e 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Uranium is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -14,7 +14,6 @@ Item { id: base - property QtObject qualityManager: CuraApplication.getQualityManager() property var resetEnabled: false // Keep PreferencesDialog happy property var extrudersModel: CuraApplication.getExtrudersModel() property var qualityManagementModel: CuraApplication.getQualityManagementModel() @@ -254,7 +253,7 @@ Item object: "" onAccepted: { - base.qualityManager.duplicateQualityChanges(newName, base.currentItem); + base.qualityManagementModel.duplicateQualityChanges(newName, base.currentItem); } } @@ -285,7 +284,7 @@ Item object: "" onAccepted: { - var actualNewName = base.qualityManager.renameQualityChangesGroup(base.currentItem.quality_changes_group, newName); + var actualNewName = base.qualityManagementModel.renameQualityChangesGroup(base.currentItem.quality_changes_group, newName); base.newQualityNameToSelect = actualNewName; // Select the new name after the model gets updated } } From 0b92c3f3dff3b073bb2a9cdc680f13cf7a9b567d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 14:56:16 +0200 Subject: [PATCH 390/994] Use .container property rather than deprecated getContainer() function Contributes to issue CURA-6600. --- cura/Machines/Models/IntentModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 61fdecb559..e4b297093f 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -119,7 +119,7 @@ class IntentModel(ListModel): # Get layer_height from the quality profile for the GlobalStack if quality_group.node_for_global is None: return float(default_layer_height) - container = quality_group.node_for_global.getContainer() + container = quality_group.node_for_global.container layer_height = default_layer_height if container and container.hasProperty("layer_height", "value"): From 626cd7e85bb83681668544eec65aa04ee224f772 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 Sep 2019 15:08:59 +0200 Subject: [PATCH 391/994] Update version numbers of quality files --- resources/intent/smooth.inst.cfg | 2 +- resources/intent/strong.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa04.inst.cfg | 2 +- resources/variants/ultimaker_s3_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker_s3_bb04.inst.cfg | 2 +- resources/variants/ultimaker_s3_cc06.inst.cfg | 2 +- 98 files changed, 98 insertions(+), 98 deletions(-) diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg index 2ec33da504..094ccb596d 100644 --- a/resources/intent/smooth.inst.cfg +++ b/resources/intent/smooth.inst.cfg @@ -4,7 +4,7 @@ name = Smooth (TEST INTENT) definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg index d0354070a0..368a2e4e73 100644 --- a/resources/intent/strong.inst.cfg +++ b/resources/intent/strong.inst.cfg @@ -4,7 +4,7 @@ name = Strong (TEST INTENT) definition = ultimaker3 [metadata] -setting_version = 9 +setting_version = 10 type = intent intent_category = engineering quality_type = draft diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg index 3116222771..d1b20176fe 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg index 350985ef89..8a0a8b2e9f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index 882bb06cd4..e52512a10d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index 5e34121579..29d5e50455 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index b216eac68a..5596bb1d33 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index 32c40c3787..3b9bfa3e3c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index bc04462e00..8d2f6092b1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index 7ffab11e22..6e5912c1a7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index e5fd572624..e8fda946e2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index 8ec152171b..a3c1e88495 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index 4f9a156b22..015c8d05e9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 98e79c0475..310e866ce4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 10b8791943..6cac452a29 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 00c8f60b74..a22960d99e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 4e6feee81a..38be6a344e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index 49fcd51a8f..be84f05a70 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index 6e0408d82d..e06e5b7a08 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index e24a84d32b..4f0e371ded 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 284cef4107..97d34cdb88 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index 487ad68099..1949a0f410 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 9de2de588e..eb079b5852 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 0cfa9778ff..3c308a5738 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 98ae2900f7..20f4a810a2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index afe5c03f8e..ae6d1235dd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 64a8dfe7cf..1ce5a8b20f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index 3ee447eb2d..cacdab09aa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg index 63985bfcd2..7a2f19146a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index 548cdbdb0d..b3157b6b5c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index f840c296b4..febe2623af 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index c93903293e..6dc88356d5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 1dfa09e923..8d997b8edf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 1c2b49839e..96b243081d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 8863835f09..6885abae9b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 1cf0cbef92..96747f5f0d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index dc46520c97..38aee9a05d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index fb047fc502..521d24ec8b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index b49d3945d4..45212bfc28 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index c02c4c642d..bb04c3f173 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index bf37d1dd4d..0d391c8406 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 6333124f22..c1c465389f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 9de9001f11..52551f620c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index 33a03d7d81..f97942a9a9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index 566a368dd4..e068ab78cc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index fe37bfe94a..66b99612ed 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index 8e4b1415f9..4ff8929f24 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index f4b1588f39..db90eb75eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index a303655ec5..087506c91d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index 1465d5bb99..23d4727604 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 18ba654a63..e987d0b55d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 8683d9f498..2dd2219d42 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index dabff34ce6..a4e20f0054 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 6371ce1337..9e6a0a2e04 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index d3f5fb50be..ce5e9afcd1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index b09f0f00df..4eecc8a625 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 639ceb2348..1bbf002989 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 6477e2d0a0..037ef0c808 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index d1d716858d..acd9bdc98a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index e6a742599b..e8cc341b36 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index 01b63d5ac5..9c02969944 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 50acc663ab..eb2cb3910c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index e4e6c1a75d..7214f0d404 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 005aaf3e04..e7e53f400d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index ea17ee7b2d..a26ff382d8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index cce48c4d79..d8b5d0b576 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index 9b7bfd217b..b033ba10fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index 1c628f57c8..ee6da50fc9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index f0adc177a3..07b4329204 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 818426141e..b0cee0f130 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 439f6a7063..728d7e8900 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index dcef8ddf72..4dbd5b609d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 3bd6295712..5d0609850d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index 7e94ba6a7c..ed4f25a56d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 4a8b11eef2..3749672b7f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index aa83fa6a3b..87c825b193 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 1c9814a87d..cb9f9ded57 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index aebbed3d5f..84ea35546b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index c9179b1480..a868c08920 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index 57019cb91f..6194f236b8 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 846679e355..9fc669fa92 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index 228045c134..57ef6fcaa2 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index ae9c23d1a8..1d8350e007 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index 56de714613..dcb5a14928 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index a5bdfad16a..420aed0076 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index f8bb270616..ffafb9fc94 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg index f2203eddbc..175bf0b435 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 7d05340547..562b3ea77b 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 4f12ea611f..142002eb1e 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index 5fd3f6d3a6..f1cc8b52fe 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg index eccb41a73e..136f7f85b9 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg index 716a75d9e9..149ba68e6b 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = verydraft weight = -3 diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 7bcf71852f..66e913862e 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index d272c05c43..6bde96fede 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index 91e7d774c7..981e86e212 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 611d351d4f..3986306c43 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 198181c33b..155ab6b67b 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index 01a9350cfe..85b88daa96 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle From a313255bc73655f86e4ee74ab096423666b5281e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 15:10:42 +0200 Subject: [PATCH 392/994] Use integer positions to get quality changes per extruder from group It's all a mix right now... Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 79417e8ed4..028e5f3740 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1151,7 +1151,7 @@ class MachineManager(QObject): container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() quality_changes_container = empty_quality_changes_container - quality_container = empty_quality_container # type: Optional[InstanceContainer] + quality_container = empty_quality_container # type: InstanceContainer if quality_changes_group.metadata_for_global: global_containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"]) if global_containers: @@ -1173,7 +1173,7 @@ class MachineManager(QObject): quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container - quality_changes_metadata = quality_changes_group.metadata_per_extruder.get(position) + quality_changes_metadata = quality_changes_group.metadata_per_extruder.get(int(position)) if quality_changes_metadata: containers = container_registry.findContainers(id = quality_changes_metadata["id"]) if containers: From f8d72b2ea7dfd7dd5c22e35ba73e771d1d8ec951 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Sep 2019 15:33:32 +0200 Subject: [PATCH 393/994] Fix crash when adding first quality changes profile This dictionary is keyed by position integers, not position strings. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 028e5f3740..7ec95cb7e5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1169,7 +1169,7 @@ class MachineManager(QObject): for position, extruder in self._global_container_stack.extruders.items(): quality_node = None if quality_group is not None: - quality_node = quality_group.nodes_for_extruders.get(position) + quality_node = quality_group.nodes_for_extruders.get(int(position)) quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container From f6089ed627961255554b35fbcb0dc002535d71e9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 11 Sep 2019 15:43:35 +0200 Subject: [PATCH 394/994] Don't use material manager to get list of materials to send The material manager is no longer populated so it wouldn't send any materials any more. This is probably faster anyway since it doesn't need to go back to the container registry for every file. Contributes to issue CURA-6600. --- .../src/Network/SendMaterialJob.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index 8de732e2a6..5637f388c1 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -68,10 +68,10 @@ class SendMaterialJob(Job): # \param materials_to_send A set with id's of materials that must be sent. def _sendMaterials(self, materials_to_send: Set[str]) -> None: container_registry = CuraApplication.getInstance().getContainerRegistry() - material_manager = CuraApplication.getInstance().getMaterialManager() - material_group_dict = material_manager.getAllMaterialGroups() + all_materials = container_registry.findInstanceContainersMetadata(type = "material") + all_root_materials = {material["base_file"] for material in all_materials if "base_file" in material} # Filters out uniques by making it a set. Don't include files without base file (i.e. empty material). - for root_material_id in material_group_dict: + for root_material_id in all_root_materials: if root_material_id not in materials_to_send: # If the material does not have to be sent we skip it. continue @@ -128,20 +128,18 @@ class SendMaterialJob(Job): @staticmethod def _getLocalMaterials() -> Dict[str, LocalMaterial]: result = {} # type: Dict[str, LocalMaterial] - material_manager = CuraApplication.getInstance().getMaterialManager() - material_group_dict = material_manager.getAllMaterialGroups() + all_materials = CuraApplication.getInstance().getContainerRegistry().findInstanceContainersMetadata(type = "material") + all_root_materials = [material for material in all_materials if material["id"] == material.get("base_file")] # Don't send materials without base_file: The empty material doesn't need to be sent. # Find the latest version of all material containers in the registry. - for root_material_id, material_group in material_group_dict.items(): - material_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = material_group.root_material_node.container_id)[0] - + for material_metadata in all_root_materials: try: # material version must be an int material_metadata["version"] = int(material_metadata["version"]) # Create a new local material local_material = LocalMaterial(**material_metadata) - local_material.id = root_material_id + local_material.id = material_metadata["id"] if local_material.GUID not in result or \ local_material.GUID not in result or \ From 2b96543cd3c78d4f8d59c8be6e6bd059a35f4be2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 11 Sep 2019 16:58:11 +0200 Subject: [PATCH 395/994] Store intent category in metadata of quality_changes as well This is necessary in order to restore it properly. Contributes to issue CURA_6600. --- cura/Machines/Models/QualityManagementModel.py | 9 +++++++-- cura/Settings/ContainerManager.py | 4 +++- cura/Settings/CuraContainerRegistry.py | 2 +- cura/Settings/cura_empty_instance_containers.py | 1 + plugins/3MFReader/ThreeMFWorkspaceReader.py | 16 ++++++++++++---- plugins/GCodeWriter/GCodeWriter.py | 2 ++ 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index d144e75515..8cbedcfc44 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -167,9 +167,11 @@ class QualityManagementModel(ListModel): continue extruder_stack = None + intent_category = None if stack.getMetaDataEntry("position") is not None: extruder_stack = stack - new_changes = self._createQualityChanges(quality_container.getMetaDataEntry("quality_type"), unique_name, global_stack, extruder_stack) + intent_category = stack.intent.getMetaDataEntry("intent_category") + new_changes = self._createQualityChanges(quality_container.getMetaDataEntry("quality_type"), intent_category, unique_name, global_stack, extruder_stack) container_manager._performMerge(new_changes, quality_changes_container, clear_settings = False) container_manager._performMerge(new_changes, stack.userChanges) @@ -177,11 +179,12 @@ class QualityManagementModel(ListModel): ## Create a quality changes container with the given set-up. # \param quality_type The quality type of the new container. + # \param intent_category The intent category of the new container. # \param new_name The name of the container. This name must be unique. # \param machine The global stack to create the profile for. # \param extruder_stack The extruder stack to create the profile for. If # not provided, only a global container will be created. - def _createQualityChanges(self, quality_type: str, new_name: str, machine: "GlobalStack", extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": + def _createQualityChanges(self, quality_type: str, intent_category: Optional[str], new_name: str, machine: "GlobalStack", extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() base_id = machine.definition.getId() if extruder_stack is None else extruder_stack.getId() new_id = base_id + "_" + new_name @@ -193,6 +196,8 @@ class QualityManagementModel(ListModel): quality_changes.setName(new_name) quality_changes.setMetaDataEntry("type", "quality_changes") quality_changes.setMetaDataEntry("quality_type", quality_type) + if intent_category is not None: + quality_changes.setMetaDataEntry("intent_category", intent_category) # If we are creating a container for an extruder, ensure we add that to the container. if extruder_stack is not None: diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index d0b856a872..f2b107f1b6 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -294,7 +294,9 @@ class ContainerManager(QObject): quality_changes.setName(current_quality_changes_name) quality_changes.setMetaDataEntry("type", "quality_changes") quality_changes.setMetaDataEntry("quality_type", current_quality_type) - quality_changes.setMetaDataEntry("position", stack.getMetaDataEntry("position")) + if stack.getMetaDataEntry("position") is not None: # Extruder stacks. + quality_changes.setMetaDataEntry("position", stack.getMetaDataEntry("position")) + quality_changes.setMetaDataEntry("intent_category", stack.quality.getMetaDataEntry("intent_category", "default")) quality_changes.setMetaDataEntry("setting_version", application.SettingVersion) quality_changes.setDefinition(machine_definition_id) container_registry.addContainer(quality_changes) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 097185b628..97634b4da4 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -269,7 +269,6 @@ class CuraContainerRegistry(ContainerRegistry): profile.setMetaDataEntry("type", "quality_changes") profile.setMetaDataEntry("definition", expected_machine_definition) profile.setMetaDataEntry("quality_type", quality_type) - profile.setMetaDataEntry("position", "0") profile.setDirty(True) if idx == 0: # Move all per-extruder settings to the first extruder's quality_changes @@ -609,6 +608,7 @@ class CuraContainerRegistry(ContainerRegistry): extruder_quality_changes_container.setMetaDataEntry("setting_version", application.SettingVersion) extruder_quality_changes_container.setMetaDataEntry("position", extruder_definition.getMetaDataEntry("position")) extruder_quality_changes_container.setMetaDataEntry("quality_type", machine_quality_changes.getMetaDataEntry("quality_type")) + extruder_quality_changes_container.setMetaDataEntry("intent_category", "default") # Intent categories weren't a thing back then. extruder_quality_changes_container.setDefinition(machine_quality_changes.getDefinition().getId()) self.addContainer(extruder_quality_changes_container) diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index 0ab37c5435..a09537272d 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -41,6 +41,7 @@ empty_quality_changes_container = copy.deepcopy(empty_container) empty_quality_changes_container.setMetaDataEntry("id", EMPTY_QUALITY_CHANGES_CONTAINER_ID) empty_quality_changes_container.setMetaDataEntry("type", "quality_changes") empty_quality_changes_container.setMetaDataEntry("quality_type", "not_supported") +empty_quality_changes_container.setMetaDataEntry("intent_category", "not_supported") # Empty intent EMPTY_INTENT_CONTAINER_ID = "empty_intent" diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 00d7252875..dc94f596ca 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -760,6 +760,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): quality_changes_info = self._machine_info.quality_changes_info quality_changes_quality_type = quality_changes_info.global_info.parser["metadata"]["quality_type"] + quality_changes_intent_category_per_extruder = {position: info.parser["metadata"].get("intent_category", "default") for position, info in quality_changes_info.extruder_info_dict.items()} quality_changes_name = quality_changes_info.name create_new = self._resolve_strategies.get("quality_changes") != "override" @@ -770,9 +771,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): quality_changes_name = self._container_registry.uniqueName(quality_changes_name) for position, container_info in container_info_dict.items(): extruder_stack = None + intent_category = None # type: Optional[str] if position is not None: extruder_stack = global_stack.extruders[position] - container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) + intent_category = quality_changes_intent_category_per_extruder[position] + container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack) container_info.container = container self._container_registry.addContainer(container) @@ -801,8 +804,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if not global_stack.extruders: ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack) extruder_stack = global_stack.extruders["0"] + intent_category = quality_changes_intent_category_per_extruder["0"] - container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) + container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack) container_info.container = container self._container_registry.addContainer(container) @@ -829,7 +833,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if container_info.container is None: extruder_stack = global_stack.extruders[position] - container = self._createNewQualityChanges(quality_changes_quality_type, quality_changes_name, global_stack, extruder_stack) + intent_category = quality_changes_intent_category_per_extruder[position] + container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack) container_info.container = container self._container_registry.addContainer(container) @@ -842,6 +847,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # # This will then later be filled with the appropriate data. # \param quality_type The quality type of the new profile. + # \param intent_category The intent category of the new profile. # \param name The name for the profile. This will later be made unique so # it doesn't need to be unique yet. # \param global_stack The global stack showing the configuration that the @@ -849,7 +855,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # \param extruder_stack The extruder stack showing the configuration that # the profile should be created for. If this is None, it will be created # for the global stack. - def _createNewQualityChanges(self, quality_type: str, name: str, global_stack: GlobalStack, extruder_stack: Optional[ExtruderStack]) -> InstanceContainer: + def _createNewQualityChanges(self, quality_type: str, intent_category: Optional[str], name: str, global_stack: GlobalStack, extruder_stack: Optional[ExtruderStack]) -> InstanceContainer: container_registry = CuraApplication.getInstance().getContainerRegistry() base_id = global_stack.definition.getId() if extruder_stack is None else extruder_stack.getId() new_id = base_id + "_" + name @@ -861,6 +867,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): quality_changes.setName(name) quality_changes.setMetaDataEntry("type", "quality_changes") quality_changes.setMetaDataEntry("quality_type", quality_type) + if intent_category is not None: + quality_changes.setMetaDataEntry("intent_category", intent_category) # If we are creating a container for an extruder, ensure we add that to the container. if extruder_stack is not None: diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index edd0cebc96..792b2aff10 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -131,6 +131,8 @@ class GCodeWriter(MeshWriter): container_with_profile.setName(quality_name) container_with_profile.setMetaDataEntry("type", "quality_changes") container_with_profile.setMetaDataEntry("quality_type", quality_type) + if stack.getMetaDataEntry("position") is not None: # For extruder stacks, the quality changes should include an intent category. + container_with_profile.setMetaDataEntry("intent_category", stack.intent.getMetaDataEntry("intent_category", "default")) container_with_profile.setDefinition(machine_definition_id_for_quality) flat_global_container = self._createFlattenedContainerInstance(stack.userChanges, container_with_profile) From f865151e8242b21ca8287a853603a2c301e1a3b5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 11 Sep 2019 17:28:42 +0200 Subject: [PATCH 396/994] Don't create intent for global stack when duplicating Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 8cbedcfc44..19885cddc9 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -116,7 +116,7 @@ class QualityManagementModel(ListModel): quality_changes_group = quality_model_item["quality_changes_group"] if quality_changes_group is None: # Create global quality changes only. - new_quality_changes = self._createQualityChanges(quality_group.quality_type, new_name, global_stack, extruder_stack = None) + new_quality_changes = self._createQualityChanges(quality_group.quality_type, None, new_name, global_stack, extruder_stack = None) container_registry.addContainer(new_quality_changes) else: for metadata in [quality_changes_group.metadata_for_global] + quality_changes_group.metadata_per_extruder.values(): From d6e010f22bcc35e4d237436f1c58a1a7b090c3bd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 11 Sep 2019 17:29:10 +0200 Subject: [PATCH 397/994] Fix iterating over all stacks Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 19885cddc9..ffdb022f38 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -119,7 +119,7 @@ class QualityManagementModel(ListModel): new_quality_changes = self._createQualityChanges(quality_group.quality_type, None, new_name, global_stack, extruder_stack = None) container_registry.addContainer(new_quality_changes) else: - for metadata in [quality_changes_group.metadata_for_global] + quality_changes_group.metadata_per_extruder.values(): + for metadata in [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()): containers = container_registry.findContainers(id = metadata["id"]) if not containers: continue From 00b02f95f9c28d351475b232afcb2ba5fe185b1a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Sep 2019 17:34:44 +0200 Subject: [PATCH 398/994] Nix 3mf-read signal-postphoning, which prevented connects. This fix was originally made to fix CURA-5056, but it turns out it now gives warnings and possibly messes up 3mf reading instead of fixing it, since it prevents the connection of new listeners to those signals. After removal, the original file this was reported against still loads instead of the crash it was reported to give in the ticket (reproduction rate supposedly 100%) so the removal probably doesn't mess things up. part of CURA-6600 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 00d7252875..2b7c76eeb9 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -14,7 +14,6 @@ from UM.Application import Application from UM.Logger import Logger from UM.Message import Message from UM.i18n import i18nCatalog -from UM.Signal import postponeSignals, CompressTechnique from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer @@ -575,24 +574,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # \param file_name @call_on_qt_thread def read(self, file_name): - container_registry = ContainerRegistry.getInstance() - signals = [container_registry.containerAdded, - container_registry.containerRemoved, - container_registry.containerMetaDataChanged] - # The container tree updates its lookup tables upon container changes. - # It is critical to make sure that it has a complete set of data when it - # updates. - # - # In project loading, lots of the container-related signals are loosely emitted, which can create timing gaps - # for incomplete data update or other kinds of issues to happen. - # - # To avoid this, we postpone all signals so they don't get emitted immediately. But, please also be aware that, - # because of this, do not expect to have the latest data in the lookup tables in project loading. - # - with postponeSignals(*signals, compress = CompressTechnique.NoCompression): - return self._read(file_name) - - def _read(self, file_name): application = CuraApplication.getInstance() material_manager = application.getMaterialManager() From 06103b98d541d8278223b70fd2ac3716cd84e9d3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 12 Sep 2019 10:30:16 +0200 Subject: [PATCH 399/994] Ensure that quality_changes get their intent_category set in upgrade CURA-6599 --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 38dd232980..a96b38902d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -37,6 +37,10 @@ class VersionUpgrade43to44(VersionUpgrade): # Update version number. parser["metadata"]["setting_version"] = "10" + # Intent profiles were added, so the quality changes should match with no intent (so "default") + if parser["metadata"].get("type", "") == "quality_changes": + parser["metadata"]["intent_category"] = "default" + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] From cb146b586de29592134da945355666717636b67c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 13:22:57 +0200 Subject: [PATCH 400/994] Emit ContainerRegistry's containerMetaDataChanged when name changes If we properly call the setName() function on the container it'll emit the signal that the metadata changes. This fixes the updating of the profiles list when you rename a container. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index ffdb022f38..0f27ef7480 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Any, Dict, Optional, TYPE_CHECKING +from typing import Any, cast, Dict, Optional, TYPE_CHECKING from PyQt5.QtCore import pyqtSlot, QObject, Qt from UM.Logger import Logger @@ -85,10 +85,13 @@ class QualityManagementModel(ListModel): return new_name application = cura.CuraApplication.CuraApplication.getInstance() - new_name = application.getContainerRegistry().uniqueName(new_name) - quality_changes_group.metadata_for_global["name"] = new_name + container_registry = application.getContainerRegistry() + new_name = container_registry.uniqueName(new_name) + global_container = cast(InstanceContainer, container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"])[0]) + global_container.setName(new_name) for metadata in quality_changes_group.metadata_per_extruder.values(): - metadata["name"] = new_name + extruder_container = cast(InstanceContainer, container_registry.findContainers(id = metadata["id"])[0]) + extruder_container.setName(new_name) quality_changes_group.name = new_name @@ -215,6 +218,7 @@ class QualityManagementModel(ListModel): # This filters the updates to the container manager: When it applies to # the list of quality changes, we need to update our list. def _qualityChangesListChanged(self, container: "ContainerInterface") -> None: + print("QualityChangesListChanged", container) if container.getMetaDataEntry("type") == "quality_changes": self._update() From 4f936f5c2387b4a735aa691b0f570a19c07d0886 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 13:28:59 +0200 Subject: [PATCH 401/994] Fix getting active quality changes group from machine manager I have the feeling that we have multiple implementations of this but it's hard to find... Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7ec95cb7e5..0c2708943f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1573,9 +1573,8 @@ class MachineManager(QObject): global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack or global_stack.qualityChanges == empty_quality_changes_container: return None - candidate_groups = ContainerTree.getInstance().getCurrentQualityChangesGroups() - for group in candidate_groups: # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. - if group.node_for_global and group.node_for_global.container_id == global_stack.qualityChanges.getId(): + for group in ContainerTree.getInstance().getCurrentQualityGroups(): # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. + if group.metadata_for_global and group.metadata_for_global["id"] == global_stack.qualityChanges.getId(): return group return None From 1b9e710f72ff14956acfd4d209ca7aec0a4427da Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 13:40:47 +0200 Subject: [PATCH 402/994] Fix exporting with new quality changes groups Those groups are starting to become a bit cumbersome... Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 9 +++++---- cura/Settings/CuraContainerRegistry.py | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index f2b107f1b6..0688a2222d 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -4,7 +4,7 @@ import os import urllib.parse import uuid -from typing import Dict, Union, Any, TYPE_CHECKING, List +from typing import Any, cast, Dict, List, TYPE_CHECKING, Union from PyQt5.QtCore import QObject, QUrl from PyQt5.QtWidgets import QMessageBox @@ -31,8 +31,6 @@ if TYPE_CHECKING: from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup - from cura.Machines.QualityManager import QualityManager - catalog = i18nCatalog("cura") @@ -448,7 +446,10 @@ class ContainerManager(QObject): if not path: return - container_list = [n.container for n in quality_changes_group.getAllNodes() if n.container is not None] + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + container_list = [cast(InstanceContainer, container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"])[0])] # type: List[InstanceContainer] + for metadata in quality_changes_group.metadata_per_extruder.values(): + container_list.append(cast(InstanceContainer, container_registry.findContainers(id = metadata["id"])[0])) cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().exportQualityProfile(container_list, path, file_type) __instance = None # type: ContainerManager diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 97634b4da4..84b714fdcf 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -101,7 +101,8 @@ class CuraContainerRegistry(ContainerRegistry): ## Exports an profile to a file # - # \param container_list \type{list} the containers to export + # \param container_list \type{list} the containers to export. This is not + # necessarily in any order! # \param file_name \type{str} the full path and filename to export to. # \param file_type \type{str} the file type with the format " (*.)" # \return True if the export succeeded, false otherwise. From 9a5d45282ad262973dc5132875d3eb1c20fd5de5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 14:54:24 +0200 Subject: [PATCH 403/994] Set intent category of quality changes group correctly If any profile has a different intent than default, the entire group becomes that intent. There can only be one intent that's different from default per group. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 3b35a3db02..8b45540723 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -124,6 +124,8 @@ class MachineNode(ContainerNode): name = quality_changes["name"] if name not in groups_by_name: groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], intent_category = quality_changes.get("intent_category", "default")) + elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. + groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") if "position" in quality_changes: # An extruder profile. groups_by_name[name].metadata_per_extruder[int(quality_changes["position"])] = quality_changes else: # Global profile. From 2d0a122c2daaff98d89f17eb9305c515b465d98b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 15:13:02 +0200 Subject: [PATCH 404/994] Display list of custom quality profiles If you activate any of them from here though, it'll crash. Contributes to issue CURA-6598. --- .../Custom/QualitiesWithIntentMenu.qml | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 96c8431112..94f9acf3b3 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -106,9 +106,9 @@ Popup if(Cura.MachineManager.hasCustomQuality) { // When user created profile is active, no quality tickbox should be active. - return false + return false; } - return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category + return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category; } ButtonGroup.group: buttonGroup @@ -118,6 +118,68 @@ Popup } } + //Another "intent category" for custom profiles. + Item + { + height: childrenRect.height + anchors + { + left: parent.left + right: parent.right + } + + Label + { + id: customProfileHeader + text: catalog.i18nc("@label:header", "Custom profiles") + renderType: Text.NativeRendering + height: visible ? contentHeight: 0 + enabled: false + visible: profilesList.visibleChildren.length > 0 + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + } + + Column + { + id: profilesList + anchors + { + top: customProfileHeader.bottom + left: parent.left + right: parent.right + } + + //We set it by means of a binding, since then we can use the + //"when" condition, which we need to prevent a binding loop. + Binding + { + target: parent + property: "height" + value: parent.childrenRect.height + when: parent.visibleChildren.length > 0 + } + + //Add all the custom profiles. + Repeater + { + visible: false + model: Cura.CustomQualityProfilesDropDownMenuModel + MenuButton + { + onClicked: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group) + + width: parent.width + checkable: true + visible: model.available + text: model.name + " - " + model.layer_height + " mm" + checked: Cura.MachineManager.activeQualityChangesGroup == model.quality_changes_group + ButtonGroup.group: buttonGroup + } + } + } + } + Rectangle { height: 1 From 92d2686fedafc8d83737eb3afca3aa5a8116cd2e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 15:19:06 +0200 Subject: [PATCH 405/994] Pick quality changes group from quality changes groups, not quality groups Oops. Probably went wrong when I copied over this code from some other place. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 0c2708943f..cd937b49e5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1573,7 +1573,7 @@ class MachineManager(QObject): global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack or global_stack.qualityChanges == empty_quality_changes_container: return None - for group in ContainerTree.getInstance().getCurrentQualityGroups(): # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. + for group in ContainerTree.getInstance().getCurrentQualityChangesGroups(): # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. if group.metadata_for_global and group.metadata_for_global["id"] == global_stack.qualityChanges.getId(): return group return None From f1299589c9ddd3c69c4f95970d015ede242efb9d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 15:49:27 +0200 Subject: [PATCH 406/994] Remove debug prints Contributes to issue CURA-6600. --- cura/Machines/Models/QualityManagementModel.py | 1 - tests/Machines/TestMaterialNode.py | 1 - 2 files changed, 2 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 0f27ef7480..6789059cba 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -218,7 +218,6 @@ class QualityManagementModel(ListModel): # This filters the updates to the container manager: When it applies to # the list of quality changes, we need to update our list. def _qualityChangesListChanged(self, container: "ContainerInterface") -> None: - print("QualityChangesListChanged", container) if container.getMetaDataEntry("type") == "quality_changes": self._update() diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index 2c1b593b54..f7e47aa634 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -34,7 +34,6 @@ def getInstanceContainerSideEffect(*args, **kwargs): if variant is None: return instance_container_metadata_dict.get(definition).get("no_variant") else: - print(variant, definition, instance_container_metadata_dict.get(definition).get(variant).get("material_1")) return instance_container_metadata_dict.get(definition).get(variant).get("material_1") if definition is None: return [{"id": "material_1", "material": "material_1"}] From 7d49fd7fa28c0dec3041baf21b60134dbb41170d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 16:15:03 +0200 Subject: [PATCH 407/994] Don't import type that's only used for type checking Contributes to issue CURA-6600. --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 360efc210f..96a4ee0648 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -2,6 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, QTimer +from typing import TYPE_CHECKING from UM.Logger import Logger from UM.Qt.ListModel import ListModel @@ -9,7 +10,9 @@ from UM.Settings.SettingFunction import SettingFunction import cura.CuraApplication # Imported this way to prevent circular dependencies. from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.QualityManager import QualityGroup + +if TYPE_CHECKING: + from cura.Machines import QualityGroup # From 9c47fc8e70ec834633657291447f0838e58bee10 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 16:15:40 +0200 Subject: [PATCH 408/994] Use container tree to get quality definition of printer Contributes to issue CURA-6600. --- plugins/CuraProfileReader/CuraProfileReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index 5e2a4266c8..fa8ca89442 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -8,7 +8,7 @@ from UM.Logger import Logger from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make. from cura.CuraApplication import CuraApplication -from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch +from cura.Machines.ContainerTree import ContainerTree from cura.ReaderWriters.ProfileReader import ProfileReader import zipfile @@ -97,7 +97,7 @@ class CuraProfileReader(ProfileReader): if global_stack is None: return None - active_quality_definition = getMachineDefinitionIDForQualitySearch(global_stack.definition) + active_quality_definition = ContainerTree.getInstance().machines[global_stack.definition.container_id].quality_definition if profile.getMetaDataEntry("definition") != active_quality_definition: profile.setMetaDataEntry("definition", active_quality_definition) return profile From 603f18ebc95fca0751089016965be38dd5b92508 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 16:44:40 +0200 Subject: [PATCH 409/994] No need to sort quality groups by type alphabetically Like, it would put 'draft' first and 'verydraft' last. Just makes no sense. They have unique layer heights already. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 2 +- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 3201f4cc25..95e5f9e8bf 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -198,7 +198,7 @@ class MaterialManager(QObject): return results # - # Used by QualityManager. Built-in quality profiles may be based on generic material IDs such as "generic_pla". + # Built-in quality profiles may be based on generic material IDs such as "generic_pla". # For materials such as ultimaker_pla_orange, no quality profiles may be found, so we should fall back to use # the generic material IDs to search for qualities. # diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 96a4ee0648..2f761bbae7 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -77,7 +77,7 @@ class QualityProfilesDropDownMenuModel(ListModel): quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() item_list = [] - for key in sorted(quality_group_dict): + for key in quality_group_dict: quality_group = quality_group_dict[key] layer_height = self._fetchLayerHeight(quality_group) From f4a2f3efa638ba7fd4152f6c01c0e409185c01c4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 12 Sep 2019 17:27:30 +0200 Subject: [PATCH 410/994] Emit activeStackChanged as documented when containers in the active stack change This fixes updating the intent models when you switch nozzles. Among other things, probably. Contributes to issue CURA-6600. --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 1 + cura/Settings/MachineManager.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 2f761bbae7..7cd9f39c7d 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -45,6 +45,7 @@ class QualityProfilesDropDownMenuModel(ListModel): application.globalContainerStackChanged.connect(self._onChange) machine_manager.activeQualityGroupChanged.connect(self._onChange) + machine_manager.activeStackChanged.connect(self._onChange) machine_manager.extruderChanged.connect(self._onChange) self._layer_height_unit = "" # This is cached diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index cd937b49e5..2aca2e7c40 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -46,7 +46,6 @@ catalog = i18nCatalog("cura") from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.CuraApplication import CuraApplication - from cura.Settings.CuraContainerStack import CuraContainerStack from cura.Machines.MaterialNode import MaterialNode from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityGroup import QualityGroup @@ -265,7 +264,11 @@ class MachineManager(QObject): def _onActiveExtruderStackChanged(self) -> None: self.blurSettings.emit() # Ensure no-one has focus. + if self._active_container_stack is not None: + self._active_container_stack.pyqtContainersChanged.disconnect(self.activeStackChanged) # Unplug from the old one. self._active_container_stack = ExtruderManager.getInstance().getActiveExtruderStack() + if self._active_container_stack is not None: + self._active_container_stack.pyqtContainersChanged.connect(self.activeStackChanged) # Plug into the new one. def __emitChangedSignals(self) -> None: self.activeQualityChanged.emit() From febe953226e65717bee60103755fee6d2bfbe73c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 13 Sep 2019 09:29:49 +0200 Subject: [PATCH 411/994] Don't assert if there are already 7 containers in stack CURA-6599 Co-Authored-By: Ghostkeeper --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index a96b38902d..43fae0b472 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -54,7 +54,8 @@ class VersionUpgrade43to44(VersionUpgrade): parser["metadata"]["setting_version"] = "10" # We should only have 6 levels when we start. - assert "7" not in parser["containers"] + if "7" in parser["containers"]: + return ([], []) # We added the intent container in Cura 4.4. This means that all other containers move one step down. parser["containers"]["7"] = parser["containers"]["6"] @@ -66,4 +67,4 @@ class VersionUpgrade43to44(VersionUpgrade): result = io.StringIO() parser.write(result) - return [filename], [result.getvalue()] \ No newline at end of file + return [filename], [result.getvalue()] From bbde75491dc3bb0a202c1e6abb29af74e69a0cd1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 13 Sep 2019 10:52:41 +0200 Subject: [PATCH 412/994] Fix version number in upgrade from 4.1 to 4.2 --- plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py index 4f94cd56fa..8fe718ca83 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py @@ -15,8 +15,8 @@ def getMetaData() -> Dict[str, Any]: "version_upgrade": { # From To Upgrade function ("preferences", 6000007): ("preferences", 6000008, upgrade.upgradePreferences), - ("machine_stack", 4000007): ("machine_stack", 5000008, upgrade.upgradeStack), - ("extruder_train", 4000007): ("extruder_train", 5000008, upgrade.upgradeStack), + ("machine_stack", 4000007): ("machine_stack", 4000008, upgrade.upgradeStack), + ("extruder_train", 4000007): ("extruder_train", 4000008, upgrade.upgradeStack), ("definition_changes", 4000007): ("definition_changes", 4000008, upgrade.upgradeInstanceContainer), ("quality_changes", 4000007): ("quality_changes", 4000008, upgrade.upgradeInstanceContainer), ("quality", 4000007): ("quality", 4000008, upgrade.upgradeInstanceContainer), From 5631e94a48f17468ee0547fb51c5e2d421442ec2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 13 Sep 2019 10:53:10 +0200 Subject: [PATCH 413/994] Fix creality variant versions --- resources/variants/creality_cr10max_0.2.inst.cfg | 2 +- resources/variants/creality_cr10max_0.3.inst.cfg | 2 +- resources/variants/creality_cr10max_0.4.inst.cfg | 2 +- resources/variants/creality_cr10max_0.5.inst.cfg | 2 +- resources/variants/creality_cr10max_0.6.inst.cfg | 2 +- resources/variants/creality_cr10max_0.8.inst.cfg | 2 +- resources/variants/creality_cr10max_1.0.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.2.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.3.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.4.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.5.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.6.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.8.inst.cfg | 2 +- resources/variants/creality_ender5plus_1.0.inst.cfg | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/variants/creality_cr10max_0.2.inst.cfg b/resources/variants/creality_cr10max_0.2.inst.cfg index cfc18f0723..426d6fdc22 100644 --- a/resources/variants/creality_cr10max_0.2.inst.cfg +++ b/resources/variants/creality_cr10max_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.3.inst.cfg b/resources/variants/creality_cr10max_0.3.inst.cfg index 8ea13ca603..054fd59e09 100644 --- a/resources/variants/creality_cr10max_0.3.inst.cfg +++ b/resources/variants/creality_cr10max_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.4.inst.cfg b/resources/variants/creality_cr10max_0.4.inst.cfg index 6545ea03c5..af0e5ca6e6 100644 --- a/resources/variants/creality_cr10max_0.4.inst.cfg +++ b/resources/variants/creality_cr10max_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.5.inst.cfg b/resources/variants/creality_cr10max_0.5.inst.cfg index 74ed412538..d2c059842a 100644 --- a/resources/variants/creality_cr10max_0.5.inst.cfg +++ b/resources/variants/creality_cr10max_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.6.inst.cfg b/resources/variants/creality_cr10max_0.6.inst.cfg index b03011efbd..63e0b1bd42 100644 --- a/resources/variants/creality_cr10max_0.6.inst.cfg +++ b/resources/variants/creality_cr10max_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.8.inst.cfg b/resources/variants/creality_cr10max_0.8.inst.cfg index 1bacfa597a..23a0ecd108 100644 --- a/resources/variants/creality_cr10max_0.8.inst.cfg +++ b/resources/variants/creality_cr10max_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_1.0.inst.cfg b/resources/variants/creality_cr10max_1.0.inst.cfg index 165fceb019..a8d9f4db4d 100644 --- a/resources/variants/creality_cr10max_1.0.inst.cfg +++ b/resources/variants/creality_cr10max_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.2.inst.cfg b/resources/variants/creality_ender5plus_0.2.inst.cfg index f95b1f9075..583a5604d2 100644 --- a/resources/variants/creality_ender5plus_0.2.inst.cfg +++ b/resources/variants/creality_ender5plus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.3.inst.cfg b/resources/variants/creality_ender5plus_0.3.inst.cfg index dadfa53952..ae1d33d78b 100644 --- a/resources/variants/creality_ender5plus_0.3.inst.cfg +++ b/resources/variants/creality_ender5plus_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.4.inst.cfg b/resources/variants/creality_ender5plus_0.4.inst.cfg index d61a65fd8f..8af2405f93 100644 --- a/resources/variants/creality_ender5plus_0.4.inst.cfg +++ b/resources/variants/creality_ender5plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.5.inst.cfg b/resources/variants/creality_ender5plus_0.5.inst.cfg index 53fa71a5d0..61db41b0b9 100644 --- a/resources/variants/creality_ender5plus_0.5.inst.cfg +++ b/resources/variants/creality_ender5plus_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.6.inst.cfg b/resources/variants/creality_ender5plus_0.6.inst.cfg index 27a4eef2c0..4f9aea34db 100644 --- a/resources/variants/creality_ender5plus_0.6.inst.cfg +++ b/resources/variants/creality_ender5plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.8.inst.cfg b/resources/variants/creality_ender5plus_0.8.inst.cfg index 517c158231..137bb93253 100644 --- a/resources/variants/creality_ender5plus_0.8.inst.cfg +++ b/resources/variants/creality_ender5plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_1.0.inst.cfg b/resources/variants/creality_ender5plus_1.0.inst.cfg index 2a66d9da78..a7aa3a3a49 100644 --- a/resources/variants/creality_ender5plus_1.0.inst.cfg +++ b/resources/variants/creality_ender5plus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle From ef0f5988a252a9b652128b0472a1228f62d1e548 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 13 Sep 2019 12:59:54 +0200 Subject: [PATCH 414/994] Fix 3MF-workspace-reading: Variants where not loaded properly. part of CURA-6600 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 37be9cfe2d..0d1118ed64 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -942,7 +942,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info = self._machine_info.extruder_info_dict[position] if extruder_info.variant_info is None: # If there is no variant_info, try to use the default variant. Otherwise, leave it be. - node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE, global_stack) + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + node = machine_node.variants[machine_node.preferred_variant_name] if node is not None and node.container is not None: extruder_stack.variant = node.container continue @@ -951,7 +952,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): variant_name = parser["general"]["name"] variant_type = VariantType.NOZZLE - node = variant_manager.getVariantNode(global_stack.definition.getId(), variant_name, variant_type) + node = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[variant_name] if node is not None and node.container is not None: extruder_stack.variant = node.container From 55a8d03d42064a8919dd3b2b190686383fe96d78 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 13 Sep 2019 13:16:48 +0200 Subject: [PATCH 415/994] Fix typing error --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 7cd9f39c7d..2311e80689 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -12,7 +12,7 @@ import cura.CuraApplication # Imported this way to prevent circular dependencie from cura.Machines.ContainerTree import ContainerTree if TYPE_CHECKING: - from cura.Machines import QualityGroup + from cura.Machines.QualityGroup import QualityGroup # From 882e60bf95a856f5103757ba72cb154e5a6b3aef Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 13 Sep 2019 13:16:46 +0200 Subject: [PATCH 416/994] Fix typing of application Because CuraApplication has the getMachineManager() function and such, not UM.Application. Discovered during work on CURA-6600. --- plugins/UFPWriter/UFPWriter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 1e6b2e80cc..0dbc069408 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -1,4 +1,4 @@ -#Copyright (c) 2018 Ultimaker B.V. +#Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. from typing import cast @@ -7,13 +7,13 @@ from Charon.VirtualFile import VirtualFile #To open UFP files. from Charon.OpenMode import OpenMode #To indicate that we want to write to UFP files. from io import StringIO #For converting g-code to bytes. -from UM.Application import Application from UM.Logger import Logger from UM.Mesh.MeshWriter import MeshWriter #The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry #To get the g-code writer. from PyQt5.QtCore import QBuffer +from cura.CuraApplication import CuraApplication from cura.Snapshot import Snapshot from cura.Utils.Threading import call_on_qt_thread @@ -79,7 +79,7 @@ class UFPWriter(MeshWriter): Logger.log("d", "Thumbnail not created, cannot save it") # Store the material. - application = Application.getInstance() + application = CuraApplication.getInstance() machine_manager = application.getMachineManager() material_manager = application.getMaterialManager() global_stack = machine_manager.activeMachine From bb0c9c80dc2b8090864ebd4888730c86b77dffe0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 13 Sep 2019 14:40:43 +0200 Subject: [PATCH 417/994] Don't use material groups to find just the root container Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well. Contributes to issue CURA-6600. --- cura/Settings/ContainerManager.py | 31 ++++++++++++++----------------- plugins/UFPWriter/UFPWriter.py | 10 +++++----- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 0688a2222d..140412076e 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -87,14 +87,15 @@ class ContainerManager(QObject): Logger.log("w", "Container node {0} doesn't have a container.".format(container_node.container_id)) return False root_material_id = container_node.container.getMetaDataEntry("base_file", "") - if cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().isReadOnly(root_material_id): + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + if container_registry.isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) return False - - material_group = MaterialManager.getInstance().getMaterialGroup(root_material_id) - if material_group is None: - Logger.log("w", "Unable to find material group for: %s.", root_material_id) + root_material_query = container_registry.findContainers(id = root_material_id) + if not root_material_query: + Logger.log("w", "Unable to find root material: {root_material}.".format(root_material = root_material_id)) return False + root_material = root_material_query[0] entries = entry_name.split("/") entry_name = entries.pop() @@ -102,7 +103,7 @@ class ContainerManager(QObject): sub_item_changed = False if entries: root_name = entries.pop(0) - root = material_group.root_material_node.container.getMetaDataEntry(root_name) + root = root_material.getMetaDataEntry(root_name) item = root for _ in range(len(entries)): @@ -115,11 +116,9 @@ class ContainerManager(QObject): entry_name = root_name entry_value = root - container = material_group.root_material_node.container - if container is not None: - container.setMetaDataEntry(entry_name, entry_value) - if sub_item_changed: #If it was only a sub-item that has changed then the setMetaDataEntry won't correctly notice that something changed, and we must manually signal that the metadata changed. - container.metaDataChanged.emit(container) + root_material.setMetaDataEntry(entry_name, entry_value) + if sub_item_changed: #If it was only a sub-item that has changed then the setMetaDataEntry won't correctly notice that something changed, and we must manually signal that the metadata changed. + root_material.metaDataChanged.emit(root_material) return True @pyqtSlot(str, result = str) @@ -355,11 +354,11 @@ class ContainerManager(QObject): if material_node.container is None: Logger.log("w", "Material node {0} doesn't have a container.".format(material_node.container_id)) return - material_group = MaterialManager.getInstance().getMaterialGroup(material_node.container.getMetaDataEntry("base_file", "")) - - if material_group is None: + root_material_query = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().findInstanceContainers(id = material_node.getMetaDataEntry("base_file", "")) + if not root_material_query: Logger.log("w", "Unable to find material group for %s", material_node) return + root_material = root_material_query[0] # Generate a new GUID new_guid = str(uuid.uuid4()) @@ -367,9 +366,7 @@ class ContainerManager(QObject): # Update the GUID # NOTE: We only need to set the root material container because XmlMaterialProfile.setMetaDataEntry() will # take care of the derived containers too - container = material_group.root_material_node.container - if container is not None: - container.setMetaDataEntry("GUID", new_guid) + root_material.setMetaDataEntry("GUID", new_guid) def _performMerge(self, merge_into: InstanceContainer, merge: InstanceContainer, clear_settings: bool = True) -> None: if merge == merge_into: diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 0dbc069408..d698cbfab7 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -81,7 +81,7 @@ class UFPWriter(MeshWriter): # Store the material. application = CuraApplication.getInstance() machine_manager = application.getMachineManager() - material_manager = application.getMaterialManager() + container_registry = application.getContainerRegistry() global_stack = machine_manager.activeMachine material_extension = "xml.fdm_material" @@ -107,12 +107,12 @@ class UFPWriter(MeshWriter): continue material_root_id = material.getMetaDataEntry("base_file") - material_group = material_manager.getMaterialGroup(material_root_id) - if material_group is None: - Logger.log("e", "Cannot find material container with root id [%s]", material_root_id) + material_root_query = container_registry.findContainers(id = material_root_id) + if not material_root_query: + Logger.log("e", "Cannot find material container with root id {root_id}".format(root_id = material_root_id)) return False + material_container = material_root_query[0] - material_container = material_group.root_material_node.container try: serialized_material = material_container.serialize() except NotImplementedError: From cc27392ab0c63df4759ca0229ec33e52e6f8b3c3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 13 Sep 2019 14:42:16 +0200 Subject: [PATCH 418/994] Don't use material groups to update metadata The material groups are not filled any more in the material manager so this fails. This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference. The function becomes a lot simpler though. And it works again. Contributes to issue CURA-6600. --- .../XmlMaterialProfile/XmlMaterialProfile.py | 37 +++++-------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 5a1abf0dfb..7dfa6483d2 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -75,37 +75,20 @@ class XmlMaterialProfile(InstanceContainer): if k in self.__material_properties_setting_map: new_setting_values_dict[self.__material_properties_setting_map[k]] = v - # Prevent recursion - if not apply_to_all: - super().setMetaDataEntry(key, value) + if not apply_to_all: # Historical: If you only want to modify THIS container. We only used that to prevent recursion but with the below code that's no longer necessary. + container_query = registry.findContainers(id = self.getId()) + else: + container_query = registry.findContainers(base_file = self.getMetaDataEntry("base_file")) + + for container in container_query: + if key not in container.getMetaData() or container.getMetaData()[key] != value: + container.getMetaData()[key] = value + container.setDirty(True) + container.metaDataChanged.emit(container) for k, v in new_setting_values_dict.items(): self.setProperty(k, "value", v) return - # Get the MaterialGroup - material_manager = CuraApplication.getInstance().getMaterialManager() - root_material_id = self.getMetaDataEntry("base_file") #if basefile is self.getId, this is a basefile. - material_group = material_manager.getMaterialGroup(root_material_id) - if not material_group: #If the profile is not registered in the registry but loose/temporary, it will not have a base file tree. - super().setMetaDataEntry(key, value) - for k, v in new_setting_values_dict.items(): - self.setProperty(k, "value", v) - return - # Update the root material container - root_material_container = material_group.root_material_node.container - if root_material_container is not None: - root_material_container.setMetaDataEntry(key, value, apply_to_all = False) - for k, v in new_setting_values_dict.items(): - root_material_container.setProperty(k, "value", v) - - # Update all containers derived from it - for node in material_group.derived_material_node_list: - container = node.container - if container is not None: - container.setMetaDataEntry(key, value, apply_to_all = False) - for k, v in new_setting_values_dict.items(): - container.setProperty(k, "value", v) - ## Overridden from InstanceContainer, similar to setMetaDataEntry. # without this function the setName would only set the name of the specific nozzle / material / machine combination container # The function is a bit tricky. It will not set the name of all containers if it has the correct name itself. From 7942db514797dfb280cdd0b0d1b79a291359db4c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 13 Sep 2019 16:07:33 +0200 Subject: [PATCH 419/994] Give empty material the required material properties It needs a GUID, base file and material type to show up in the material nodes in the container tree. Contributes to issue CURA-6775. --- cura/Settings/cura_empty_instance_containers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index a09537272d..b142c53c11 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -25,6 +25,9 @@ EMPTY_MATERIAL_CONTAINER_ID = "empty_material" empty_material_container = copy.deepcopy(empty_container) empty_material_container.setMetaDataEntry("id", EMPTY_MATERIAL_CONTAINER_ID) empty_material_container.setMetaDataEntry("type", "material") +empty_material_container.setMetaDataEntry("base_file", "empty_material") +empty_material_container.setMetaDataEntry("GUID", "FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF") +empty_material_container.setMetaDataEntry("material", "empty") # Empty quality EMPTY_QUALITY_CONTAINER_ID = "empty_quality" From 2cca95384df688a2baa8233d9f3558df96db97af Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 13 Sep 2019 16:09:02 +0200 Subject: [PATCH 420/994] Don't look for quality group for empty material Just don't add it to the list of available intents then. Contributes to issue CURA-6775. --- cura/Machines/Models/IntentModel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index e4b297093f..8773a12fd3 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -74,6 +74,8 @@ class IntentModel(ListModel): active_material_node = active_variant_node.materials[active_extruder.material.getMetaDataEntry("base_file")] layer_heights_added = [] for quality_id, quality_node in active_material_node.qualities.items(): + if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). + continue quality_group = quality_groups[quality_node.quality_type] layer_height = self._fetchLayerHeight(quality_group) From 0b3757fb3c2e9ae24de5eb069c9705820cacefd7 Mon Sep 17 00:00:00 2001 From: SAMSECTOR Date: Sat, 14 Sep 2019 16:46:58 +0300 Subject: [PATCH 421/994] Add Original_Prusa_i3_MK3S_MK3_platform.stl This is the latest mesh for Prusa i3 MK3/MK3s made by Prusa Research with minor modification to fit in Prusa folder under "add printer" reference : https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611 --- .../Original_Prusa_i3_MK3S_MK3_platform.stl | Bin 0 -> 487884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/meshes/Original_Prusa_i3_MK3S_MK3_platform.stl diff --git a/resources/meshes/Original_Prusa_i3_MK3S_MK3_platform.stl b/resources/meshes/Original_Prusa_i3_MK3S_MK3_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..3b38a7daa2fa39a6e85d3c1b174ab5bbc4db7259 GIT binary patch literal 487884 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

j^v)#!(oSNbq4fDm_QG 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 literal 0 HcmV?d00001 From e1a52f841f4fce77d751bb40d6fed3eff98a55fc Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 16 Sep 2019 10:43:22 +0200 Subject: [PATCH 422/994] Correct typing --- cura/Machines/MaterialManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 95e5f9e8bf..264f7bbd8b 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -287,7 +287,8 @@ class MaterialManager(QObject): if root_material_id is not None: self.removeMaterialByRootId(root_material_id) - def duplicateMaterialByRootId(self, root_material_id, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + def duplicateMaterialByRootId(self, root_material_id: str, new_base_id: Optional[str] = None, + new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: container_registry = CuraContainerRegistry.getInstance() results = container_registry.findContainers(id=root_material_id) @@ -346,12 +347,14 @@ class MaterialManager(QObject): # Returns the root material ID of the duplicated material if successful. # @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, + new_metadata: Optional[Dict[str, Any]] = None) -> str: if material_node.container is None: Logger.log("e", "Material node {0} doesn't have container.".format(material_node.container_id)) return "ERROR" root_material_id = cast(str, material_node.container.getMetaDataEntry("base_file", "")) - return self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) + new_material_id = self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) + return new_material_id if new_material_id is not None else "ERROR" # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. # Returns the ID of the newly created material. From 3c9d191a6e0f0cec5a44849e98ee517ec676b07c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 14:57:45 +0200 Subject: [PATCH 423/994] Add separate definition for Ultimaker 2 with Olsson block This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer. However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible. By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well. Contributes to issue CURA-6775. --- resources/definitions/ultimaker2_olsson.def.json | 12 ++++++++++++ ...0.25.inst.cfg => ultimaker2_olsson_0.25.inst.cfg} | 2 +- ...2_0.4.inst.cfg => ultimaker2_olsson_0.4.inst.cfg} | 2 +- ...2_0.6.inst.cfg => ultimaker2_olsson_0.6.inst.cfg} | 2 +- ...2_0.8.inst.cfg => ultimaker2_olsson_0.8.inst.cfg} | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 resources/definitions/ultimaker2_olsson.def.json rename resources/variants/{ultimaker2_0.25.inst.cfg => ultimaker2_olsson_0.25.inst.cfg} (86%) rename resources/variants/{ultimaker2_0.4.inst.cfg => ultimaker2_olsson_0.4.inst.cfg} (85%) rename resources/variants/{ultimaker2_0.6.inst.cfg => ultimaker2_olsson_0.6.inst.cfg} (85%) rename resources/variants/{ultimaker2_0.8.inst.cfg => ultimaker2_olsson_0.8.inst.cfg} (85%) diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json new file mode 100644 index 0000000000..ad0da1bbcc --- /dev/null +++ b/resources/definitions/ultimaker2_olsson.def.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "Ultimaker 2 with Olsson Block", + "inherits": "ultimaker2", + "metadata": { + "has_variants": true + }, + + "overrides": { + "machine_name": { "default_value": "Ultimaker 2 with Olsson Block" } + } +} diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg similarity index 86% rename from resources/variants/ultimaker2_0.25.inst.cfg rename to resources/variants/ultimaker2_olsson_0.25.inst.cfg index a844b28ad7..04b03b40c6 100644 --- a/resources/variants/ultimaker2_0.25.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.25 mm version = 4 -definition = ultimaker2 +definition = ultimaker2_olsson [metadata] setting_version = 9 diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_olsson_0.4.inst.cfg similarity index 85% rename from resources/variants/ultimaker2_0.4.inst.cfg rename to resources/variants/ultimaker2_olsson_0.4.inst.cfg index 4f66962a7c..4a5986db5f 100644 --- a/resources/variants/ultimaker2_0.4.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm version = 4 -definition = ultimaker2 +definition = ultimaker2_olsson [metadata] setting_version = 9 diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_olsson_0.6.inst.cfg similarity index 85% rename from resources/variants/ultimaker2_0.6.inst.cfg rename to resources/variants/ultimaker2_olsson_0.6.inst.cfg index 2b73baf1ad..0cfe375ca4 100644 --- a/resources/variants/ultimaker2_0.6.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm version = 4 -definition = ultimaker2 +definition = ultimaker2_olsson [metadata] setting_version = 9 diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_olsson_0.8.inst.cfg similarity index 85% rename from resources/variants/ultimaker2_0.8.inst.cfg rename to resources/variants/ultimaker2_olsson_0.8.inst.cfg index 70bdc42b35..82765cc0e4 100644 --- a/resources/variants/ultimaker2_0.8.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm version = 4 -definition = ultimaker2 +definition = ultimaker2_olsson [metadata] setting_version = 9 From c6a57a0ab74e1f2f1be5babfcf7c05fcd030dcec Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 15:00:05 +0200 Subject: [PATCH 424/994] Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 This way, the user's profiles should remain intact after the upgrade. Contributes to issue CURA-6775. --- resources/definitions/ultimaker2_olsson.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json index ad0da1bbcc..2f8b877942 100644 --- a/resources/definitions/ultimaker2_olsson.def.json +++ b/resources/definitions/ultimaker2_olsson.def.json @@ -3,7 +3,8 @@ "name": "Ultimaker 2 with Olsson Block", "inherits": "ultimaker2", "metadata": { - "has_variants": true + "has_variants": true, + "quality_definition": "ultimaker2" }, "overrides": { From 3b5716a64a06ccc42669dc76ec2dc81d728a0330 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 15:07:04 +0200 Subject: [PATCH 425/994] Add definition for Ultimaker 2 Extended with Olsson Block Only the name is now too long by default. I have to shorten it. Contributes to issue CURA-6775. --- .../definitions/ultimaker2_extended_olsson.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/definitions/ultimaker2_extended_olsson.def.json diff --git a/resources/definitions/ultimaker2_extended_olsson.def.json b/resources/definitions/ultimaker2_extended_olsson.def.json new file mode 100644 index 0000000000..86f3c3c194 --- /dev/null +++ b/resources/definitions/ultimaker2_extended_olsson.def.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "Ultimaker 2 Extended with Olsson Block", + "inherits": "ultimaker2_extended", + "metadata": { + "has_variants": true + }, + + "overrides": { + "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson Block" } + } +} From bda7a6ce0ada72885a41eac6b42fd2315edb408e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 15:15:17 +0200 Subject: [PATCH 426/994] Shorten name of UM2E with Olsson This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura. Contributes to issue CURA-6775. --- resources/definitions/ultimaker2_extended_olsson.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker2_extended_olsson.def.json b/resources/definitions/ultimaker2_extended_olsson.def.json index 86f3c3c194..d2eb7f9a5d 100644 --- a/resources/definitions/ultimaker2_extended_olsson.def.json +++ b/resources/definitions/ultimaker2_extended_olsson.def.json @@ -1,12 +1,12 @@ { "version": 2, - "name": "Ultimaker 2 Extended with Olsson Block", + "name": "Ultimaker 2 Extended with Olsson", "inherits": "ultimaker2_extended", "metadata": { "has_variants": true }, "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson Block" } + "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson" } } } From 9b341cf604a856d6aca5ecb861490db938439e21 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 15:19:47 +0200 Subject: [PATCH 427/994] Remove UM2 upgrade selection machine action Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with. Contributes to issue CURA-6775. --- .../UM2UpgradeSelection.py | 76 ------------------- .../UM2UpgradeSelectionMachineAction.qml | 55 -------------- plugins/UltimakerMachineActions/__init__.py | 6 +- resources/definitions/ultimaker2.def.json | 2 - resources/definitions/ultimaker2_go.def.json | 1 - 5 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 plugins/UltimakerMachineActions/UM2UpgradeSelection.py delete mode 100644 plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml diff --git a/plugins/UltimakerMachineActions/UM2UpgradeSelection.py b/plugins/UltimakerMachineActions/UM2UpgradeSelection.py deleted file mode 100644 index 999cb1d35a..0000000000 --- a/plugins/UltimakerMachineActions/UM2UpgradeSelection.py +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Uranium is released under the terms of the LGPLv3 or higher. - -from PyQt5.QtCore import pyqtSignal, pyqtProperty - -from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.i18n import i18nCatalog -from UM.Application import Application -from UM.Util import parseBool - -from cura.MachineAction import MachineAction - -catalog = i18nCatalog("cura") - - -## The Ultimaker 2 can have a few revisions & upgrades. -class UM2UpgradeSelection(MachineAction): - def __init__(self): - super().__init__("UM2UpgradeSelection", catalog.i18nc("@action", "Select upgrades")) - self._qml_url = "UM2UpgradeSelectionMachineAction.qml" - - self._container_registry = ContainerRegistry.getInstance() - - self._current_global_stack = None - - Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) - self._reset() - - def _reset(self): - self.hasVariantsChanged.emit() - - def _onGlobalStackChanged(self): - if self._current_global_stack: - self._current_global_stack.metaDataChanged.disconnect(self._onGlobalStackMetaDataChanged) - - self._current_global_stack = Application.getInstance().getGlobalContainerStack() - if self._current_global_stack: - self._current_global_stack.metaDataChanged.connect(self._onGlobalStackMetaDataChanged) - self._reset() - - def _onGlobalStackMetaDataChanged(self): - self._reset() - - hasVariantsChanged = pyqtSignal() - - def setHasVariants(self, has_variants = True): - global_container_stack = Application.getInstance().getGlobalContainerStack() - if global_container_stack: - variant_container = global_container_stack.extruders["0"].variant - - if has_variants: - global_container_stack.setMetaDataEntry("has_variants", True) - - # Set the variant container to a sane default - empty_container = ContainerRegistry.getInstance().getEmptyInstanceContainer() - if type(variant_container) == type(empty_container): - search_criteria = { "type": "variant", "definition": "ultimaker2", "id": "*0.4*" } - containers = self._container_registry.findInstanceContainers(**search_criteria) - if containers: - global_container_stack.extruders["0"].variant = containers[0] - else: - # The metadata entry is stored in an ini, and ini files are parsed as strings only. - # Because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. - if "has_variants" in global_container_stack.getMetaData(): - global_container_stack.removeMetaDataEntry("has_variants") - - # Set the variant container to an empty variant - global_container_stack.extruders["0"].variant = ContainerRegistry.getInstance().getEmptyInstanceContainer() - - Application.getInstance().globalContainerStackChanged.emit() - self._reset() - - @pyqtProperty(bool, fset = setHasVariants, notify = hasVariantsChanged) - def hasVariants(self): - if self._current_global_stack: - return parseBool(self._current_global_stack.getMetaDataEntry("has_variants", "false")) diff --git a/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml deleted file mode 100644 index 13525f6eb3..0000000000 --- a/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2019 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.10 -import QtQuick.Controls 2.3 - -import UM 1.3 as UM -import Cura 1.1 as Cura - - -Cura.MachineAction -{ - UM.I18nCatalog { id: catalog; name: "cura"; } - anchors.fill: parent - - Item - { - id: upgradeSelectionMachineAction - anchors.fill: parent - anchors.topMargin: UM.Theme.getSize("default_margin").width * 5 - anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4 - - Label - { - id: pageDescription - anchors.top: parent.top - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label", "Please select any upgrades made to this Ultimaker 2.") - font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering - } - - Cura.CheckBox - { - id: olssonBlockCheckBox - anchors.top: pageDescription.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - - height: UM.Theme.getSize("setting_control").height - - text: catalog.i18nc("@label", "Olsson Block") - checked: manager.hasVariants - onClicked: manager.hasVariants = checked - - Connections - { - target: manager - onHasVariantsChanged: olssonBlockCheckBox.checked = manager.hasVariants - } - } - } -} diff --git a/plugins/UltimakerMachineActions/__init__.py b/plugins/UltimakerMachineActions/__init__.py index e87949580a..aecb3b0ad6 100644 --- a/plugins/UltimakerMachineActions/__init__.py +++ b/plugins/UltimakerMachineActions/__init__.py @@ -1,9 +1,8 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from . import BedLevelMachineAction from . import UMOUpgradeSelection -from . import UM2UpgradeSelection def getMetaData(): return {} @@ -11,6 +10,5 @@ def getMetaData(): def register(app): return { "machine_action": [ BedLevelMachineAction.BedLevelMachineAction(), - UMOUpgradeSelection.UMOUpgradeSelection(), - UM2UpgradeSelection.UM2UpgradeSelection() + UMOUpgradeSelection.UMOUpgradeSelection() ]} diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 285f5bed08..bb1ab13196 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -14,8 +14,6 @@ "has_materials": false, "has_machine_quality": true, "preferred_variant_name": "0.4 mm", - "first_start_actions": ["UM2UpgradeSelection"], - "supported_actions":["UM2UpgradeSelection"], "machine_extruder_trains": { "0": "ultimaker2_extruder_0" diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index 9e374b2c88..774d215bef 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -11,7 +11,6 @@ "platform": "ultimaker2go_platform.obj", "platform_texture": "Ultimaker2Gobackplate.png", "platform_offset": [0, 0, 0], - "first_start_actions": [], "machine_extruder_trains": { "0": "ultimaker2_go_extruder_0" From 5617784b48af103e6b3a7ceece1e8650ac7e2fa9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Sep 2019 15:38:01 +0200 Subject: [PATCH 428/994] Implement version upgrade for UM2 with Olsson Contributes to issue CURA-6775. --- .../VersionUpgrade43to44.py | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 43fae0b472..39095887b5 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -51,19 +51,32 @@ class VersionUpgrade43to44(VersionUpgrade): parser.read_string(serialized) # Update version number. - parser["metadata"]["setting_version"] = "10" + if "metadata" in parser: + parser["metadata"]["setting_version"] = "10" - # We should only have 6 levels when we start. - if "7" in parser["containers"]: - return ([], []) + if "containers" in parser: + # With the ContainerTree refactor, UM2 with Olsson block got moved to a separate definition. + if "6" in parser["containers"]: + if parser["containers"]["6"] == "ultimaker2": + if "metadata" in parser and "has_variants" in parser["metadata"] and parser["metadata"]["has_variants"] == "True": # This is an Olsson block upgraded UM2! + parser["containers"]["6"] = "ultimaker2_olsson" + del parser["metadata"]["has_variants"] + elif parser["containers"]["6"] == "ultimaker2_extended": + if "metadata" in parser and "has_variants" in parser["metadata"] and parser["metadata"]["has_variants"] == "True": # This is an Olsson block upgraded UM2E! + parser["containers"]["6"] = "ultimaker2_extended_olsson" + del parser["metadata"]["has_variants"] - # We added the intent container in Cura 4.4. This means that all other containers move one step down. - parser["containers"]["7"] = parser["containers"]["6"] - parser["containers"]["6"] = parser["containers"]["5"] - parser["containers"]["5"] = parser["containers"]["4"] - parser["containers"]["4"] = parser["containers"]["3"] - parser["containers"]["3"] = parser["containers"]["2"] - parser["containers"]["2"] = "empty_intent" + # We should only have 6 levels when we start. + if "7" in parser["containers"]: + return ([], []) + + # We added the intent container in Cura 4.4. This means that all other containers move one step down. + parser["containers"]["7"] = parser["containers"]["6"] + parser["containers"]["6"] = parser["containers"]["5"] + parser["containers"]["5"] = parser["containers"]["4"] + parser["containers"]["4"] = parser["containers"]["3"] + parser["containers"]["3"] = parser["containers"]["2"] + parser["containers"]["2"] = "empty_intent" result = io.StringIO() parser.write(result) From e946eb1b5ca844f757bd6d0e8deb8f83c5991b26 Mon Sep 17 00:00:00 2001 From: SAMSECTOR Date: Mon, 16 Sep 2019 22:29:58 +0300 Subject: [PATCH 429/994] Creat Original_Prusa_i3_MK3S_MK3.def.json This is the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with minor modification to fit in Prusa folder under "add printer" reference : https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611 --- .../Original_Prusa_i3_MK3S_MK3.def.json | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json diff --git a/resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json b/resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json new file mode 100644 index 0000000000..439cc1fcda --- /dev/null +++ b/resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json @@ -0,0 +1,53 @@ +{ + "version": 2, + "name": "Original Prusa i3 MK3S/MK3", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Prusa Research", + "manufacturer": "Prusa3D", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform": "Original_Prusa_i3_MK3S_MK3_platform.stl", + "has_materials": true, + "machine_extruder_trains": + { + "0": "Original_Prusa_i3_MK3S_MK3_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Original Prusa i3 MK3S/MK3" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 250 }, + "machine_height": { "default_value": 210 }, + "machine_depth": { "default_value": 210 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "material_bed_temperature": { "default_value": 60 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.15 }, + "layer_height_0": { "default_value": 0.2 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "retraction_retract_speed": { "default_value": 35 }, + "retraction_prime_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "default_value": 28 }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" + } + } +} From bd1e370fe66df1b85b52e08e4e0ab0a871eee4c2 Mon Sep 17 00:00:00 2001 From: SAMSECTOR Date: Mon, 16 Sep 2019 22:31:16 +0300 Subject: [PATCH 430/994] Create Original_Prusa_i3_MK3S_MK3_extruder_0.def This is the latest extruder definition for Prusa i3 MK3/MK3s . reference : https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611 --- ...riginal_Prusa_i3_MK3S_MK3_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json diff --git a/resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json b/resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json new file mode 100644 index 0000000000..18d69e4557 --- /dev/null +++ b/resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "Original_Prusa_i3_MK3S_MK3_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Original_Prusa_i3_MK3S_MK3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file From 00676e3878a5e0bd3eaf6355de6a0f0fdd5c2cab Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:53:13 -0500 Subject: [PATCH 431/994] Create key3d_tyro.def.json --- resources/definitions/key3d_tyro.def.json | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 resources/definitions/key3d_tyro.def.json diff --git a/resources/definitions/key3d_tyro.def.json b/resources/definitions/key3d_tyro.def.json new file mode 100644 index 0000000000..e14f601d7d --- /dev/null +++ b/resources/definitions/key3d_tyro.def.json @@ -0,0 +1,65 @@ +{ + "name": "Tyro", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "DragonJe", + "manufacturer": "Key3D", + "file_formats": "text/x-gcode", + "platform_offset": [0, 0, 0], + "has_materials": true, + "has_variants": false, + "preferred_quality_type": "normal", + "has_machine_quality": true, + "preferred_material": "generic_pla", + "machine_extruder_trains": + { + "0": "key3d_tyro_extruder_0" + } + }, + + "overrides": { + "machine_name": { + "default_value": "Tyro" + }, + "machine_width": { + "default_value": 150 + }, + "machine_height": { + "default_value": 150 + }, + "machine_depth": { + "default_value": 150 + }, + "machine_head_polygon": { + "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + "gantry_height": { + "value": "30" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": false + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} From 3c24e9fa189616b5f5be96ae851e586f2e878a05 Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:54:04 -0500 Subject: [PATCH 432/994] Create key3d_tyro_extruder_0.def.json --- .../extruders/key3d_tyro_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/key3d_tyro_extruder_0.def.json diff --git a/resources/extruders/key3d_tyro_extruder_0.def.json b/resources/extruders/key3d_tyro_extruder_0.def.json new file mode 100644 index 0000000000..6d5b83a1ef --- /dev/null +++ b/resources/extruders/key3d_tyro_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "key3d_tyro_extruder_0", + "version": 2, + "name": "0.4mm Nozzle", + "inherits": "fdmextruder", + "metadata": { + "machine": "Tyro", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 7774da41784998ecd2bf471ae2fb4c9070614ae3 Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:55:43 -0500 Subject: [PATCH 433/994] Create key3d_tyro_normal.inst.cfg --- .../quality/key3d/key3d_tyro_normal.inst.cfg | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 resources/quality/key3d/key3d_tyro_normal.inst.cfg diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg new file mode 100644 index 0000000000..7f650612ff --- /dev/null +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -0,0 +1,127 @@ +[general] +version = 4 +name = Normal Quality +definition = key3d_tyro + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.24 +line_width = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 20 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 0 +material_bed_temperature = 0 +build_volume_temperature = 0 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 50 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.32 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.21 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False From 065d6b7f6a23faedaa9fd33710fe6a75730e6c4a Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:56:20 -0500 Subject: [PATCH 434/994] Create key3d_tyro_fast.inst.cfg --- .../quality/key3d/key3d_tyro_fast.inst.cfg | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 resources/quality/key3d/key3d_tyro_fast.inst.cfg diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg new file mode 100644 index 0000000000..4ca4a65950 --- /dev/null +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -0,0 +1,127 @@ +[general] +version = 4 +name = Fast Quality +definition = key3d_tyro + +[metadata] +setting_version = 9 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +layer_height = 0.24 +layer_height_0 = 0.24 +line_width = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 15 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 0 +material_bed_temperature = 0 +build_volume_temperature = 0 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 60 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.48 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False From 679e555a34cfae080cab47a8548675078f425fda Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:57:29 -0500 Subject: [PATCH 435/994] Create key3d_tyro_best.inst.cfg --- .../quality/key3d/key3d_tyro_best.inst.cfg | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 resources/quality/key3d/key3d_tyro_best.inst.cfg diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg new file mode 100644 index 0000000000..e5a257f898 --- /dev/null +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -0,0 +1,128 @@ +[general] +version = 4 +name = Best Quality +definition = key3d_tyro + +[metadata] +setting_version = 9 +type = quality +quality_type = best +weight = 1 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.24 +line_width = 0.4 +wall_line_width_0 = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 20 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 0 +material_bed_temperature = 0 +build_volume_temperature = 0 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 30 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.24 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.2 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False From 977beb8dbb0aa92c7dc450a2cbfbbb65ab53faf9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 08:55:29 +0200 Subject: [PATCH 436/994] Re-build container tree if has_materials changes during runtime A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager. Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 1 - .../MachineSettingsAction.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 4a5a4c0885..6c54a6890d 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -5,7 +5,6 @@ from typing import Any, Dict, List, Optional, TYPE_CHECKING from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot -from UM.Logger import Logger from UM.Util import parseBool from UM.Settings.InstanceContainer import InstanceContainer from UM.Decorators import deprecated diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index d48475b1e6..a0ce51df9b 100755 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -11,7 +11,9 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Util import parseBool +import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.MachineAction import MachineAction +from cura.Machines.ContainerTree import ContainerTree # To re-build the machine node when hasMaterials changes. from cura.Settings.CuraStackBuilder import CuraStackBuilder from cura.Settings.cura_empty_instance_containers import isEmptyContainer @@ -41,6 +43,9 @@ class MachineSettingsAction(MachineAction): self._backend = self._application.getBackend() self.onFinished.connect(self._onFinished) + # If the g-code flavour changes between UltiGCode and another flavour, we need to update the container tree. + self._application.globalContainerStackChanged.connect(self._updateHasMaterialsInContainerTree) + # Which container index in a stack to store machine setting changes. @pyqtProperty(int, constant = True) def storeContainerIndex(self) -> int: @@ -51,6 +56,16 @@ class MachineSettingsAction(MachineAction): if isinstance(container, DefinitionContainer) and container.getMetaDataEntry("type") == "machine": self._application.getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) + ## Triggered when the global container stack changes or when the g-code + # flavour setting is changed. + def _updateHasMaterialsInContainerTree(self) -> None: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + + if machine_node.has_materials != parseBool(global_stack.getMetaDataEntry("has_materials")): # May have changed due to the g-code flavour. + machine_node.has_materials = parseBool(global_stack.getMetaDataEntry("has_materials")) + machine_node._loadAll() + def _reset(self): global_stack = self._application.getMachineManager().activeMachine if not global_stack: @@ -111,6 +126,8 @@ class MachineSettingsAction(MachineAction): if "has_materials" in global_stack.getMetaData(): global_stack.removeMetaDataEntry("has_materials") + self._updateHasMaterialsInContainerTree() + # set materials for position in extruder_positions: if has_materials: From eaf649023a1e73533fc49a162a7af513c11ec603 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 09:23:33 +0200 Subject: [PATCH 437/994] Fix setting default material after g-code flavour changes has_materials Don't use the material manager here any more. Contributes to issue CURA-6600. --- .../MachineSettingsAction/MachineSettingsAction.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index a0ce51df9b..25586ddeb0 100755 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -113,11 +113,8 @@ class MachineSettingsAction(MachineAction): return machine_manager = self._application.getMachineManager() - material_manager = self._application.getMaterialManager() - extruder_positions = list(global_stack.extruders.keys()) has_materials = global_stack.getProperty("machine_gcode_flavor", "value") != "UltiGCode" - material_node = None if has_materials: global_stack.setMetaDataEntry("has_materials", True) else: @@ -129,10 +126,12 @@ class MachineSettingsAction(MachineAction): self._updateHasMaterialsInContainerTree() # set materials - for position in extruder_positions: - if has_materials: - material_node = material_manager.getDefaultMaterial(global_stack, position, None) - machine_manager.setMaterial(position, material_node) + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + for position, extruder in enumerate(global_stack.extruderList): + #Find out what material we need to default to. + approximate_diameter = round(extruder.getProperty("material_diameter", "value")) + material_node = machine_node.variants[extruder.variant.getName()].preferredMaterial(approximate_diameter) + machine_manager.setMaterial(str(position), material_node) self._application.globalContainerStackChanged.emit() From 614c2970ea6a313ed45949d613d7f49fad1a4cc0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 15:50:38 +0200 Subject: [PATCH 438/994] Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter So we don't need to round it again. Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 264f7bbd8b..fc04af3cd2 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -131,8 +131,8 @@ class MaterialManager(QObject): # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. materials = self.getAvailableMaterials(machine.definition.getId(), nozzle_name) - compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) - result = {key: material for key, material in materials.items() if material.container and material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + compatible_material_diameter = extruder_stack.getApproximateMaterialDiameter() + result = {key: material for key, material in materials.items() if material.container and float(material.container.getMetaDataEntry("approximate_diameter")) == compatible_material_diameter} return result # From 5f2e2d5320fc9c8f188b5a7d63186402c9f78721 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 15:58:10 +0200 Subject: [PATCH 439/994] Use correct material diameter, rather than always 3 This function shouldn't be called any more anyway, though. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index fc04af3cd2..0e4b60495e 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -171,9 +171,11 @@ class MaterialManager(QObject): def getMaterialNodeByType(self, global_stack: "GlobalStack", position: str, nozzle_name: str, buildplate_name: Optional[str], material_guid: str) -> Optional["MaterialNode"]: machine_definition = global_stack.definition - variant_name = global_stack.extruders[position].variant.getName() + extruder = global_stack.extruderList[int(position)] + variant_name = extruder.variant.getName() + approximate_diameter = extruder.getApproximateMaterialDiameter() - return self.getMaterialNode(machine_definition.getId(), variant_name, buildplate_name, 3, material_guid) + return self.getMaterialNode(machine_definition.getId(), variant_name, buildplate_name, approximate_diameter, material_guid) # There are 2 ways to get fallback materials; # - A fallback by type (@sa getFallbackMaterialIdByMaterialType), which adds the generic version of this material From 37d54071f031dd6727c7b4d71e4d3ff98e6b0df5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 16:35:39 +0200 Subject: [PATCH 440/994] Don't use material manager any more to sync with printers Or to change material from a base file ID. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a8d7379cf7..b0a6a6a5ac 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -26,7 +26,6 @@ import cura.CuraApplication # Imported like this to prevent circular references from cura.Machines.ContainerNode import ContainerNode from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.MaterialManager import MaterialManager from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel @@ -1343,6 +1342,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return self.blurSettings.emit() + container_registry = CuraContainerRegistry.getInstance() with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): self.switchPrinterType(configuration.printerType) @@ -1379,20 +1379,18 @@ class MachineManager(QObject): else: machine_node = ContainerTree.getInstance().machines.get(self._global_container_stack.definition.getId()) variant_node = machine_node.variants.get(extruder_configuration.hotendID) - if variant_node: - self._setVariantNode(position, variant_node) - else: - self._global_container_stack.extruders[position].variant = empty_variant_container + self._setVariantNode(position, variant_node) - material_container_node = MaterialManager.getInstance().getMaterialNodeByType(self._global_container_stack, - position, - extruder_configuration.hotendID, - configuration.buildplateConfiguration, - extruder_configuration.material.guid) - if material_container_node: - self._setMaterial(position, material_container_node) - else: - self._global_container_stack.extruders[position].material = empty_material_container + # Find the material profile that the printer has stored. + # This might find one of the duplicates if the user duplicated the material to sync with. But that's okay; both have this GUID so both are correct. + approximate_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) + materials_with_guid = container_registry.findInstanceContainersMetadata(guid = extruder_configuration.material.guid, approximate_diameter = approximate_diameter) + material_container_node = variant_node.preferredMaterial(approximate_diameter) + if materials_with_guid: # We also have the material profile that the printer wants to share. + base_file = materials_with_guid[0]["base_file"] + material_container_node = variant_node.materials.get(base_file, default = material_container_node) # If Cura thinks that the selected material is not available for this printer, revert to the preferred material. + + self._setMaterial(position, material_container_node) self._global_container_stack.extruders[position].setEnabled(True) self.updateMaterialWithVariant(position) @@ -1440,8 +1438,7 @@ class MachineManager(QObject): extruder_stack = self._global_container_stack.extruders[position] nozzle_name = extruder_stack.variant.getName() material_diameter = extruder_stack.getApproximateMaterialDiameter() - material_node = MaterialManager.getInstance().getMaterialNode(machine_definition_id, nozzle_name, buildplate_name, - material_diameter, root_material_id) + material_node = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials[root_material_id] self.setMaterial(position, material_node) ## Global_stack: if you want to provide your own global_stack instead of the current active one From 5f4051ab5c62d19313e29c8207a9ebaf6e8b2192 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 16:41:32 +0200 Subject: [PATCH 441/994] Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter There was a function to round it for us already. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 66718e8e4f..e2c43ed883 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -127,8 +127,8 @@ class BaseMaterialsModel(ListModel): return nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials - compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) - self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter} + approximate_material_diameter = extruder_stack.getApproximateMaterialDiameter() + self._available_materials = {key: material for key, material in materials.items() if float(material.container.getMetaDataEntry("approximate_diameter")) == approximate_material_diameter} ## This method is used by all material models in the beginning of the # _update() method in order to prevent errors. It's the same in all models From 3712f9c1f8a8366fac7b344dcae388075d1ce4ed Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 16:56:00 +0200 Subject: [PATCH 442/994] Correct parameter name It's the base file, not the ID. Contributes to issue CURA-6600. --- cura/Settings/IntentManager.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 251cf0aed8..8de660145e 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -13,9 +13,6 @@ if TYPE_CHECKING: ## Front-end for querying which intents are available for a certain # configuration. -# -# CURRENTLY THIS CLASS CONTAINS ONLY SOME PSEUDOCODE OF WHAT WE ARE SUPPOSED -# TO IMPLEMENT. class IntentManager(QObject): __instance = None @@ -43,9 +40,9 @@ class IntentManager(QObject): # \param material_id ID of the material. # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. - def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]: + def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(type = "intent", definition = definition_id, variant = nozzle_name, material = material_id) + return registry.findContainersMetadata(type = "intent", definition = definition_id, variant = nozzle_name, material = material_base_file) ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From fc679758ef22031ab532a6461aaf9984d812dd1a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 16:57:16 +0200 Subject: [PATCH 443/994] Optimise getting intent categories It's in the container tree, so there's no need for separate queries to the container registry. Contributes to issue CURA-6600. --- cura/Settings/IntentManager.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 8de660145e..89df530f6a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -37,12 +37,16 @@ class IntentManager(QObject): # # \param definition_id ID of the printer. # \param nozzle_name Name of the nozzle. - # \param material_id ID of the material. + # \param material_base_file The base_file of the material. # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: - registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - return registry.findContainersMetadata(type = "intent", definition = definition_id, variant = nozzle_name, material = material_base_file) + material_node = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials[material_base_file] + intent_metadatas = [] + for quality_node in material_node.qualities.values(): + for intent_node in quality_node.intents.values(): + intent_metadatas.append(intent_node.getMetadata()) + return intent_metadatas ## Collects and returns all intent categories available for the given # parameters. Note that the 'default' category is always available. From 80e79f6e7ea13012474316eb2eaab420bf7e394b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 16:58:12 +0200 Subject: [PATCH 444/994] Remove TODO Was done in previous commit, but I already pushed so no more --amend now. Contributes to issue CURA-6600. --- cura/Settings/IntentManager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 89df530f6a..71f5e3705a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -78,7 +78,6 @@ class IntentManager(QObject): # even though there should always be defaults. The problem then is what to do with the quality_types. # Currently _also_ inconsistent with 'currentAvailableIntentCategories', which _does_ return default. quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() - # TODO: These quality nodes in that tree already contain the intent nodes. We can optimise this. available_quality_types = {quality_group.quality_type for quality_group in quality_groups.values() if quality_group.node_for_global is not None} final_intent_ids = set() # type: Set[str] From 963f5e6dd73d780ce19f5cc02a0d22f22ce696aa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 17:03:05 +0200 Subject: [PATCH 445/994] Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks. Contributes to issue CURA-6600. --- cura/Settings/MachineManager.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b0a6a6a5ac..ac44163898 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1300,8 +1300,7 @@ class MachineManager(QObject): self._setMaterial(position_item, new_material) else: # The current material is not available, find the preferred one. - material_diameter = self._global_container_stack.extruders[position].getCompatibleMaterialDiameter() - approximate_material_diameter = round(material_diameter) + approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) material_node = nozzle_node.preferredMaterial(approximate_material_diameter) self._setMaterial(position_item, material_node) From 0eb3c5c0d63d61c390c450a1b066fd2821277df4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 17:50:38 +0200 Subject: [PATCH 446/994] Refer material manager functions through to material management model That's where the materials are duplicated now. So we only maintain one implementation of that. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 87 +++++-------------- .../Models/MaterialManagementModel.py | 28 ++++-- 2 files changed, 40 insertions(+), 75 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 0e4b60495e..08f1bdcba5 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -289,74 +289,27 @@ class MaterialManager(QObject): if root_material_id is not None: self.removeMaterialByRootId(root_material_id) - def duplicateMaterialByRootId(self, root_material_id: str, new_base_id: Optional[str] = None, - new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: - container_registry = CuraContainerRegistry.getInstance() - results = container_registry.findContainers(id=root_material_id) - - if not results: - Logger.log("i", "Unable to duplicate the material with id %s, because it doesn't exist.", root_material_id) - return None - - base_container = results[0] - - # Ensure all settings are saved. - cura.CuraApplication.CuraApplication.getInstance().saveSettings() - - # Create a new ID & container to hold the data. - new_containers = [] - if new_base_id is None: - new_base_id = container_registry.uniqueName(base_container.getId()) - new_base_container = copy.deepcopy(base_container) - new_base_container.getMetaData()["id"] = new_base_id - new_base_container.getMetaData()["base_file"] = new_base_id - if new_metadata is not None: - for key, value in new_metadata.items(): - new_base_container.getMetaData()[key] = value - new_containers.append(new_base_container) - - # Clone all of them. - for container_to_copy in container_registry.findContainers(base_file=root_material_id): - if container_to_copy.getId() == root_material_id: - continue # We already have that one, skip it - new_id = new_base_id - if container_to_copy.getMetaDataEntry("definition") != "fdmprinter": - new_id += "_" + container_to_copy.getMetaDataEntry("definition") - if container_to_copy.getMetaDataEntry("variant_name"): - nozzle_name = container_to_copy.getMetaDataEntry("variant_name") - new_id += "_" + nozzle_name.replace(" ", "_") - - new_container = copy.deepcopy(container_to_copy) - new_container.getMetaData()["id"] = new_id - new_container.getMetaData()["base_file"] = new_base_id - if new_metadata is not None: - for key, value in new_metadata.items(): - new_container.getMetaData()[key] = value - new_containers.append(new_container) - - for container_to_add in new_containers: - container_to_add.setDirty(True) - container_registry.addContainer(container_to_add) - - # if the duplicated material was favorite then the new material should also be added to favorite. - if root_material_id in self.getFavorites(): - cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().addFavorite(new_base_id) - - return new_base_id - - # - # Creates a duplicate of a material, which has the same GUID and base_file metadata. - # Returns the root material ID of the duplicated material if successful. - # - @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, - new_metadata: Optional[Dict[str, Any]] = None) -> str: - if material_node.container is None: - Logger.log("e", "Material node {0} doesn't have container.".format(material_node.container_id)) + def duplicateMaterialByRootId(self, root_material_id: str, new_base_id: Optional[str] = None, new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: + result = cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().duplicateMaterialByBaseFile(root_material_id, new_base_id, new_metadata) + if result is None: return "ERROR" - root_material_id = cast(str, material_node.container.getMetaDataEntry("base_file", "")) - new_material_id = self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata) - return new_material_id if new_material_id is not None else "ERROR" + return result + + ## Creates a duplicate of a material with the same GUID and base_file + # metadata. + # \param material_node The node representing the material to duplicate. + # \param new_base_id A new material ID for the base material. The IDs of + # the submaterials will be based off this one. If not provided, a material + # ID will be generated automatically. + # \param new_metadata Metadata for the new material. If not provided, this + # will be duplicated from the original material. + # \return The root material ID of the duplicate material. + @pyqtSlot("QVariant", result = str) + def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Optional[Dict[str, Any]] = None) -> str: + result = cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().duplicateMaterial(material_node, new_base_id, new_metadata) + if result is None: + return "ERROR" + return result # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. # Returns the ID of the newly created material. diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index f9af587293..a0b61e0b9b 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -73,20 +73,19 @@ class MaterialManagementModel(QObject): ## Creates a duplicate of a material with the same GUID and base_file # metadata. - # \param material_node The node representing the material to duplicate. + # \param base_file: The base file of the material to duplicate. # \param new_base_id A new material ID for the base material. The IDs of # the submaterials will be based off this one. If not provided, a material # ID will be generated automatically. # \param new_metadata Metadata for the new material. If not provided, this # will be duplicated from the original material. # \return The root material ID of the duplicate material. - @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: "MaterialNode", new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + def duplicateMaterialByBaseFile(self, base_file: str, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: container_registry = CuraContainerRegistry.getInstance() - root_materials = container_registry.findContainers(id = material_node.base_file) + root_materials = container_registry.findContainers(id = base_file) if not root_materials: - Logger.log("i", "Unable to duplicate the root material with ID {root_id}, because it doesn't exist.".format(root_id = material_node.base_file)) + Logger.log("i", "Unable to duplicate the root material with ID {root_id}, because it doesn't exist.".format(root_id = base_file)) return None root_material = root_materials[0] @@ -105,8 +104,8 @@ class MaterialManagementModel(QObject): new_containers = [new_root_material] # Clone all submaterials. - for container_to_copy in container_registry.findInstanceContainers(base_file = material_node.base_file): - if container_to_copy.getId() == material_node.base_file: + for container_to_copy in container_registry.findInstanceContainers(base_file = base_file): + if container_to_copy.getId() == base_file: continue # We already have that one. Skip it. new_id = new_base_id definition = container_to_copy.getMetaDataEntry("definition") @@ -129,12 +128,25 @@ class MaterialManagementModel(QObject): # If the duplicated material was favorite then the new material should also be added to the favorites. favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";")) - if material_node.base_file in favorites_set: + if base_file in favorites_set: favorites_set.add(new_base_id) application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set)) return new_base_id + ## Creates a duplicate of a material with the same GUID and base_file + # metadata. + # \param material_node The node representing the material to duplicate. + # \param new_base_id A new material ID for the base material. The IDs of + # the submaterials will be based off this one. If not provided, a material + # ID will be generated automatically. + # \param new_metadata Metadata for the new material. If not provided, this + # will be duplicated from the original material. + # \return The root material ID of the duplicate material. + @pyqtSlot("QVariant", result = str) + def duplicateMaterial(self, material_node: "MaterialNode", new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + return self.duplicateMaterialByBaseFile(material_node.base_file, new_base_id, new_metadata) + ## Create a new material by cloning the preferred material for the current # material diameter and generate a new GUID. # From 9392a3553c08b576f0e5c513cd8e9605f0f9c8c4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 17:54:26 +0200 Subject: [PATCH 447/994] Use implementation from MaterialManagementModel The material manager is deprecated now. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 38 +++++++------------------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 08f1bdcba5..831605e8d2 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -311,38 +311,16 @@ class MaterialManager(QObject): return "ERROR" return result - # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. - # Returns the ID of the newly created material. + ## Create a new material by cloning the preferred material for the current + # material diameter and generate a new GUID. + # + # The material type is explicitly left to be the one from the preferred + # material, since this allows the user to still have SOME profiles to work + # with. + # \return The ID of the newly created material. @pyqtSlot(result = str) def createMaterial(self) -> str: - from UM.i18n import i18nCatalog - catalog = i18nCatalog("cura") - # Ensure all settings are saved. - application = cura.CuraApplication.CuraApplication.getInstance() - application.saveSettings() - - machine_manager = application.getMachineManager() - extruder_stack = machine_manager.activeStack - - global_stack = application.getGlobalContainerStack() - if global_stack is None: - Logger.log("e", "Global stack not present!") - return "ERROR" - machine_definition = global_stack.definition - root_material_id = machine_definition.getMetaDataEntry("preferred_material", default = "generic_pla") - - approximate_diameter = str(extruder_stack.approximateMaterialDiameter) - root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_diameter) - - # Create a new ID & container to hold the data. - new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material") - new_metadata = {"name": catalog.i18nc("@label", "Custom Material"), - "brand": catalog.i18nc("@label", "Custom"), - "GUID": str(uuid.uuid4()), - } - - self.duplicateMaterialByRootId(root_material_id, new_base_id = new_id, new_metadata = new_metadata) - return new_id + return cura.CuraApplication.CuraApplication.getMaterialManagementModel().createMaterial() @pyqtSlot(str) def addFavorite(self, root_material_id: str) -> None: From 8710bb77a7db2fa2a630b9bc966b4aa83c0c481d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 17:57:32 +0200 Subject: [PATCH 448/994] Use MaterialManagementModel to rename materials It's the replacement for the deprecation. Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 831605e8d2..a5cefcb8f4 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -268,18 +268,12 @@ class MaterialManager(QObject): return False return True + ## Change the user-visible name of a material. + # \param material_node The ContainerTree node of the material to rename. + # \param name The new name for the material. @pyqtSlot("QVariant", str) def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: - if material_node.container is None: - return - root_material_id = material_node.container.getMetaDataEntry("base_file") - if root_material_id is None: - return - if CuraContainerRegistry.getInstance().isReadOnly(root_material_id): - Logger.log("w", "Cannot set name of read-only container %s.", root_material_id) - return - containers = CuraContainerRegistry.getInstance().findInstanceContainers(id = root_material_id) - containers[0].setName(name) + return cura.CuraApplication.CuraApplication.getMaterialManagementModel().setMaterialName(material_node, name) @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: From b460ffeb9be8e905bfbf2f1aaef9446515fe453c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Sep 2019 17:59:50 +0200 Subject: [PATCH 449/994] Use removeMaterial from MaterialManagementModel Contributes to issue CURA-6600. --- cura/Machines/MaterialManager.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index a5cefcb8f4..dc9fb55902 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -275,13 +275,19 @@ class MaterialManager(QObject): def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: return cura.CuraApplication.CuraApplication.getMaterialManagementModel().setMaterialName(material_node, name) + ## Deletes a material from Cura. + # + # This function does not do any safety checking any more. Please call this + # function only if: + # - The material is not read-only. + # - The material is not used in any stacks. + # If the material was not lazy-loaded yet, this will fully load the + # container. When removing this material node, all other materials with + # the same base fill will also be removed. + # \param material_node The material to remove. @pyqtSlot("QVariant") def removeMaterial(self, material_node: "MaterialNode") -> None: - if material_node.container is None: - return - root_material_id = material_node.container.getMetaDataEntry("base_file") - if root_material_id is not None: - self.removeMaterialByRootId(root_material_id) + return cura.CuraApplication.CuraApplication.getMaterialManagementModel().setMaterialName(material_node) def duplicateMaterialByRootId(self, root_material_id: str, new_base_id: Optional[str] = None, new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: result = cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().duplicateMaterialByBaseFile(root_material_id, new_base_id, new_metadata) From 2571f54d3ca59acb6d5bd922c6fdd8df9fffd670 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 Sep 2019 14:01:23 +0200 Subject: [PATCH 450/994] Simplify looping over quality groups Contributes to issue CURA-6600. --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 2311e80689..8b3999275d 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -78,9 +78,7 @@ class QualityProfilesDropDownMenuModel(ListModel): quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() item_list = [] - for key in quality_group_dict: - quality_group = quality_group_dict[key] - + for quality_group in quality_group_dict.values(): layer_height = self._fetchLayerHeight(quality_group) item = {"name": quality_group.name, From fade8d3644fbe26a90f1261deee6b58928ed6b41 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 18 Sep 2019 14:10:52 +0200 Subject: [PATCH 451/994] No longer make border width hardcoded CURA-6598 --- resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index 29436da9cf..cebe130a20 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -22,7 +22,7 @@ Button background: Rectangle { id: backgroundRectangle - border.width: 1 + border.width: UM.Theme.getSize("default_lining").width border.color: button.checked ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" color: button.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" radius: UM.Theme.getSize("action_button_radius").width From 84e5114566198862d185dcc87b4fedd6ea952a1f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 18 Sep 2019 14:17:26 +0200 Subject: [PATCH 452/994] Fix minor review comments CURA-6598 --- .../Custom/QualitiesWithIntentMenu.qml | 3 ++- resources/qml/RadioCheckbar.qml | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 94f9acf3b3..cff4e3e7a6 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -182,11 +182,12 @@ Popup Rectangle { - height: 1 + height: UM.Theme.getSize("default_lining").height anchors.left: parent.left anchors.right: parent.right color: borderColor } + MenuButton { labelText: Cura.Actions.addProfile.text diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 3c767a6201..59dba59910 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -14,7 +14,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") property color defaultItemColor: UM.Theme.getColor("small_button_active") - property int checkboxSize: UM.Theme.getSize("radio_button").height * 0.75 + property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize property int barSize: UM.Theme.getSize("slider_groove_radius").height property var isCheckedFunction // Function that accepts the modelItem and returns if the item should be active. @@ -36,8 +36,8 @@ Item { left: buttonBar.left right: buttonBar.right - leftMargin: (checkboxSize - inactiveMarkerSize) / 2 - rightMargin: (checkboxSize - inactiveMarkerSize) / 2 + leftMargin: Math.round((checkboxSize - inactiveMarkerSize) / 2) + rightMargin: Math.round((checkboxSize - inactiveMarkerSize) / 2) verticalCenter: parent.verticalCenter } } @@ -72,7 +72,7 @@ Item property Item previousItem: repeater.itemAt(index - 1) height: barSize - width: buttonBar.width / (repeater.count - 1) - activeComponent.width - 2 + width: Math.round(buttonBar.width / (repeater.count - 1) - activeComponent.width - 2) color: defaultItemColor anchors @@ -110,7 +110,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter height: inactiveMarkerSize width: inactiveMarkerSize - radius: width / 2 + radius: Math.round(width / 2) color: inactiveColor } } @@ -132,7 +132,7 @@ Item { height: checkboxSize width: checkboxSize - radius: width / 2 + radius: Math.round(width / 2) border.color: defaultItemColor @@ -143,7 +143,7 @@ Item margins: 3 fill: parent } - radius: width / 2 + radius: Math.round(width / 2) color: activeColor visible: checkbox.checked } From a3e9316f4858581863cd7ead9b2d80c6f30e308f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 Sep 2019 14:26:41 +0200 Subject: [PATCH 453/994] Rename all_root_materials to all_base_files This naming is more consistent with the naming of the metadata entry and most of the other code. Contributes to issue CURA-6600. --- plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index 5637f388c1..e13ac96c40 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -69,9 +69,9 @@ class SendMaterialJob(Job): def _sendMaterials(self, materials_to_send: Set[str]) -> None: container_registry = CuraApplication.getInstance().getContainerRegistry() all_materials = container_registry.findInstanceContainersMetadata(type = "material") - all_root_materials = {material["base_file"] for material in all_materials if "base_file" in material} # Filters out uniques by making it a set. Don't include files without base file (i.e. empty material). + all_base_files = {material["base_file"] for material in all_materials if "base_file" in material} # Filters out uniques by making it a set. Don't include files without base file (i.e. empty material). - for root_material_id in all_root_materials: + for root_material_id in all_base_files: if root_material_id not in materials_to_send: # If the material does not have to be sent we skip it. continue From 05de920c21cc3cf262ecb376de86e6944c3852bb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 Sep 2019 14:28:22 +0200 Subject: [PATCH 454/994] Once more with feeling Sorry, I didn't see the other review comment until after I pushed the previous commit. Contributes to issue CURA-6600. --- plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index e13ac96c40..09949ed37e 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -129,10 +129,10 @@ class SendMaterialJob(Job): def _getLocalMaterials() -> Dict[str, LocalMaterial]: result = {} # type: Dict[str, LocalMaterial] all_materials = CuraApplication.getInstance().getContainerRegistry().findInstanceContainersMetadata(type = "material") - all_root_materials = [material for material in all_materials if material["id"] == material.get("base_file")] # Don't send materials without base_file: The empty material doesn't need to be sent. + all_base_files = [material for material in all_materials if material["id"] == material.get("base_file")] # Don't send materials without base_file: The empty material doesn't need to be sent. # Find the latest version of all material containers in the registry. - for material_metadata in all_root_materials: + for material_metadata in all_base_files: try: # material version must be an int material_metadata["version"] = int(material_metadata["version"]) From 7693de325ab51f82b43ab134b26a0a105939e084 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 18 Sep 2019 14:39:06 +0200 Subject: [PATCH 455/994] Add loggin when user tries to change intent CURA-6598 --- cura/Settings/IntentManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 71f5e3705a..d4f12b9313 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -4,6 +4,7 @@ from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING import cura.CuraApplication +from UM.Logger import Logger from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_intent_container from UM.Settings.InstanceContainer import InstanceContainer @@ -11,6 +12,7 @@ from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: from UM.Settings.InstanceContainer import InstanceContainer + ## Front-end for querying which intents are available for a certain # configuration. class IntentManager(QObject): @@ -131,6 +133,7 @@ class IntentManager(QObject): ## Apply intent on the stacks. @pyqtSlot(str, str) def selectIntent(self, intent_category: str, quality_type: str) -> None: + Logger.log("i", "Attempting to set intent_category to [%s] and quality type to [%s]", intent_category, quality_type) old_intent_category = self.currentIntentCategory application = cura.CuraApplication.CuraApplication.getInstance() global_stack = application.getGlobalContainerStack() From 78ab218cc21be78721de10ebdf39c4b24dc30eb8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 18 Sep 2019 14:52:51 +0200 Subject: [PATCH 456/994] No longer reset to default intent when configuration changed This caused the intent to be reset every time a change was made. CURA-6600 --- cura/Machines/Models/IntentCategoryModel.py | 4 ++-- cura/Settings/IntentManager.py | 18 +----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 5211889801..c436f94421 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -10,7 +10,7 @@ from cura.Settings.IntentManager import IntentManager from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry #To update the list if anything changes. from PyQt5.QtCore import pyqtProperty, pyqtSignal - +import cura.CuraApplication if TYPE_CHECKING: from UM.Settings.ContainerRegistry import ContainerInterface @@ -48,7 +48,7 @@ class IntentCategoryModel(ListModel): ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) - IntentManager.getInstance().configurationChanged.connect(self.update) + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.update) self.update() diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index d4f12b9313..1a73fb818c 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -18,12 +18,6 @@ if TYPE_CHECKING: class IntentManager(QObject): __instance = None - def __init__(self) -> None: - super().__init__() - cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.configurationChanged) - self.configurationChanged.connect(self.selectDefaultIntent) - pass - ## This class is a singleton. @classmethod def getInstance(cls): @@ -31,7 +25,6 @@ class IntentManager(QObject): cls.__instance = IntentManager() return cls.__instance - configurationChanged = pyqtSignal() #Triggered when something changed in the rest of the stack. intentCategoryChanged = pyqtSignal() #Triggered when we switch categories. ## Gets the metadata dictionaries of all intent profiles for a given @@ -150,13 +143,4 @@ class IntentManager(QObject): extruder_stack.intent = self.getDefaultIntent() application.getMachineManager().setQualityGroupByQualityType(quality_type) if old_intent_category != intent_category: - self.intentCategoryChanged.emit() - - ## Selects the default intents on every extruder. - def selectDefaultIntent(self) -> None: - application = cura.CuraApplication.CuraApplication.getInstance() - global_stack = application.getGlobalContainerStack() - if global_stack is None: - return - for extruder_stack in global_stack.extruderList: - extruder_stack.intent = self.getDefaultIntent() + self.intentCategoryChanged.emit() \ No newline at end of file From 49276db073c385c6f6be6f561556f28fe9c1082d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 09:39:52 +0200 Subject: [PATCH 457/994] Fix display of intent in profile selection CURA-6598 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ac44163898..b28d0fa27c 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -618,7 +618,7 @@ class MachineManager(QObject): if not self._active_container_stack: return "" - intent_category = self._active_container_stack.intent.getMetaDataEntry("intent_category") + intent_category = self._active_container_stack.intent.getMetaDataEntry("intent_category", "default") return intent_category ## Returns whether there is anything unsupported in the current set-up. From 884a3ea81960bc4502e781648e61d8fea46af77a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 09:54:47 +0200 Subject: [PATCH 458/994] Fix selection for intents if only one of the extruders has an intent CURA-6598 --- cura/Machines/Models/IntentModel.py | 16 +++++++++++++++- cura/Settings/MachineManager.py | 9 +++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 8773a12fd3..79d26db8d3 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -66,12 +66,26 @@ class IntentModel(ListModel): container_tree = ContainerTree.getInstance() machine_node = container_tree.machines[global_stack.definition.getId()] - active_extruder = ExtruderManager.getInstance().getActiveExtruderStack() + + # We can't just look at the active extruder, since it is possible for only one extruder to have an intent + # and the other extruders have no intent (eg, default). It is not possible for one extruder to have intent A and + # the other to have B. + # So we will use the first extruder that we find that has an intent that is not default as the "active" extruder + + active_extruder = None + for extruder in global_stack.extruderList: + if extruder.intent.getMetaDataEntry("intent_category", "default") == "default": + if active_extruder is None: + active_extruder = extruder # If there is no extruder found and the intent is default, use that. + else: # We found an intent, use that extruder as "active" + active_extruder = extruder + if not active_extruder: return active_variant_name = active_extruder.variant.getMetaDataEntry("name") active_variant_node = machine_node.variants[active_variant_name] active_material_node = active_variant_node.materials[active_extruder.material.getMetaDataEntry("base_file")] + layer_heights_added = [] for quality_id, quality_node in active_material_node.qualities.items(): if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b28d0fa27c..c8fef837fc 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -615,10 +615,15 @@ class MachineManager(QObject): @pyqtProperty(str, notify=activeIntentChanged) def activeIntentCategory(self): + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if not self._active_container_stack: + if not global_container_stack: return "" - intent_category = self._active_container_stack.intent.getMetaDataEntry("intent_category", "default") + intent_category = "default" + for extruder in global_container_stack.extruderList: + category = extruder.intent.getMetaDataEntry("intent_category", "default") + if category != "default" and category != intent_category: + intent_category = category return intent_category ## Returns whether there is anything unsupported in the current set-up. From c76c183c6b994c63bd357ff5472778a820c283a9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 13:45:13 +0200 Subject: [PATCH 459/994] Remove unused code --- cura/Settings/MachineManager.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index c8fef837fc..4ff5ad95cd 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1433,15 +1433,11 @@ class MachineManager(QObject): def setMaterialById(self, position: str, root_material_id: str) -> None: if self._global_container_stack is None: return - buildplate_name = None - if self._global_container_stack.variant.getId() != "empty_variant": - buildplate_name = self._global_container_stack.variant.getName() machine_definition_id = self._global_container_stack.definition.id position = str(position) extruder_stack = self._global_container_stack.extruders[position] nozzle_name = extruder_stack.variant.getName() - material_diameter = extruder_stack.getApproximateMaterialDiameter() material_node = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials[root_material_id] self.setMaterial(position, material_node) @@ -1625,7 +1621,3 @@ class MachineManager(QObject): abbr_machine += stripped_word return abbr_machine - - # Gets all machines that belong to the given group_id. - def getMachinesInGroup(self, group_id: str) -> List["GlobalStack"]: - return self._container_registry.findContainerStacks(type = "machine", group_id = group_id) From d8b59c44712b65388cd4726c07e84606ef32580b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 19 Sep 2019 14:25:58 +0200 Subject: [PATCH 460/994] Fix renamed um2 nozzles CURA-6599 --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 39095887b5..e24766933f 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -3,6 +3,13 @@ from typing import Tuple, List import io from UM.VersionUpgrade import VersionUpgrade +_renamed_container_id_map = { + "ultimaker2_0.25": "ultimaker2_olsson_0.25", + "ultimaker2_0.4": "ultimaker2_olsson_0.4", + "ultimaker2_0.6": "ultimaker2_olsson_0.6", + "ultimaker2_0.8": "ultimaker2_olsson_0.8", +} + class VersionUpgrade43to44(VersionUpgrade): def getCfgVersion(self, serialised: str) -> int: @@ -78,6 +85,11 @@ class VersionUpgrade43to44(VersionUpgrade): parser["containers"]["3"] = parser["containers"]["2"] parser["containers"]["2"] = "empty_intent" + # Update renamed containers + for key, value in parser["containers"].items(): + if value in _renamed_container_id_map: + parser["containers"][key] = _renamed_container_id_map[value] + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] From 3730ea247d801c2369151eca833f2e25e23630bc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 14:26:18 +0200 Subject: [PATCH 461/994] Ensure that intent gets updated when changing quality / material CURA-6775 --- cura/Settings/MachineManager.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 4ff5ad95cd..8c4f9a0e80 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1109,6 +1109,7 @@ class MachineManager(QObject): self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() + self._updateIntentWithQuality() def _setQualityGroup(self, quality_group: Optional["QualityGroup"], empty_quality_changes: bool = True) -> None: if self._global_container_stack is None: @@ -1136,6 +1137,7 @@ class MachineManager(QObject): self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() + self._updateIntentWithQuality() def _fixQualityChangesGroupToNotSupported(self, quality_changes_group: "QualityChangesGroup") -> None: metadatas = [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()) @@ -1277,6 +1279,21 @@ class MachineManager(QObject): current_quality_type, quality_type) self._setQualityGroup(candidate_quality_groups[quality_type], empty_quality_changes = True) + ## Update the current intent after the quality changed + def _updateIntentWithQuality(self): + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return + Logger.log("d", "Updating intent due to quality change") + + category = "default" + + for extruder in global_stack.extruderList: + current_category = extruder.intent.getMetaDataEntry("intent_category", "default") + if current_category != "default" and current_category != category: + category = current_category + self.setIntentByCategory(category) + ## Update the material profile in the current stacks when the variant is # changed. # \param position The extruder stack to update. If provided with None, all From 6e625b2cf8e84e9d0a68c221c582c006c7d2a6ba Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 19 Sep 2019 14:34:52 +0200 Subject: [PATCH 462/994] Fix typing --- cura/Settings/MachineManager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 4ff5ad95cd..a16fd0d18d 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1305,9 +1305,10 @@ class MachineManager(QObject): self._setMaterial(position_item, new_material) else: # The current material is not available, find the preferred one. - approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) - material_node = nozzle_node.preferredMaterial(approximate_material_diameter) - self._setMaterial(position_item, material_node) + if position is not None: + approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) + material_node = nozzle_node.preferredMaterial(approximate_material_diameter) + self._setMaterial(position_item, material_node) ## Given a printer definition name, select the right machine instance. In case it doesn't exist, create a new # instance with the same network key. From 472e6e88c3ed498e4cd2e93c0bda16171388e164 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 19 Sep 2019 14:39:03 +0200 Subject: [PATCH 463/994] Fix typing --- plugins/MachineSettingsAction/MachineSettingsAction.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index 25586ddeb0..28535024a7 100755 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -60,6 +60,8 @@ class MachineSettingsAction(MachineAction): # flavour setting is changed. def _updateHasMaterialsInContainerTree(self) -> None: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] if machine_node.has_materials != parseBool(global_stack.getMetaDataEntry("has_materials")): # May have changed due to the g-code flavour. From 3e474c1107e4e65f8434dfdd40e3552aad33af9c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 14:54:58 +0200 Subject: [PATCH 464/994] Ensure that enabling & disabling an extruder gets handled correctly CURA-6775 --- cura/Machines/Models/IntentModel.py | 3 +++ cura/Settings/MachineManager.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 79d26db8d3..e105f012cd 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -35,6 +35,7 @@ class IntentModel(ListModel): machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() machine_manager.globalContainerChanged.connect(self._update) + machine_manager.extruderChanged.connect(self._update) # We also need to update if an extruder gets disabled ContainerRegistry.getInstance().containerAdded.connect(self._onChanged) ContainerRegistry.getInstance().containerRemoved.connect(self._onChanged) self._layer_height_unit = "" # This is cached @@ -74,6 +75,8 @@ class IntentModel(ListModel): active_extruder = None for extruder in global_stack.extruderList: + if not extruder.isEnabled: + continue if extruder.intent.getMetaDataEntry("intent_category", "default") == "default": if active_extruder is None: active_extruder = extruder # If there is no extruder found and the intent is default, use that. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 8c4f9a0e80..277ecd1a86 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1289,6 +1289,8 @@ class MachineManager(QObject): category = "default" for extruder in global_stack.extruderList: + if not extruder.isEnabled: + continue current_category = extruder.intent.getMetaDataEntry("intent_category", "default") if current_category != "default" and current_category != category: category = current_category From 830b22e381d1155a2fcca70055e61cefada5adc0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 15:12:29 +0200 Subject: [PATCH 465/994] Fix crash when adding a machine without materials CURA-6775 --- cura/Machines/Models/BaseMaterialsModel.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index e2c43ed883..7dcdb7fd57 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -27,6 +27,9 @@ class BaseMaterialsModel(ListModel): self._application = CuraApplication.getInstance() + self._available_materials = {} # type: Dict[str, MaterialNode] + self._favorite_ids = set() # type: Set[str] + # Make these managers available to all material models self._container_registry = self._application.getInstance().getContainerRegistry() self._machine_manager = self._application.getMachineManager() @@ -60,9 +63,6 @@ class BaseMaterialsModel(ListModel): self.addRoleName(Qt.UserRole + 15, "container_node") self.addRoleName(Qt.UserRole + 16, "is_favorite") - self._available_materials = None # type: Optional[Dict[str, MaterialNode]] - self._favorite_ids = set() # type: Set[str] - def _updateExtruderStack(self): global_stack = self._machine_manager.activeMachine if global_stack is None: @@ -122,6 +122,8 @@ class BaseMaterialsModel(ListModel): # Update the available materials (ContainerNode) for the current active machine and extruder setup. global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if not global_stack.hasMaterials: + return # There are no materials for this machine, so nothing to do. extruder_stack = global_stack.extruders.get(str(self._extruder_position)) if not extruder_stack: return From 7016e791c8681ca68b1691fced059609d0d385a4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 15:33:19 +0200 Subject: [PATCH 466/994] Fix containertree for machines without materials but with specific qualities CURA-6775 --- cura/Machines/MaterialNode.py | 2 ++ resources/definitions/fdmprinter.def.json | 1 + 2 files changed, 3 insertions(+) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 988adeb830..08015ac72e 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -60,6 +60,8 @@ class MaterialNode(ContainerNode): # Find all quality profiles that fit on this material. if not self.variant.machine.has_machine_quality: # Need to find the global qualities. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") + elif not self.variant.machine.has_materials: + qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) else: # Need to find the qualities that specify a material profile with the same material type. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 570f2fc3e4..37ab4256ec 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -12,6 +12,7 @@ "visible": false, "has_materials": true, "has_variants": false, + "has_machine_quality": false, "preferred_material": "generic_pla", "preferred_quality_type": "normal", "machine_extruder_trains": From 7dcf08399184c049ee9a8f4d9aa1a10e080d2253 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 15:56:06 +0200 Subject: [PATCH 467/994] Fix container tree for printers that have no variants but do have qualities & materials CURA-6775 --- cura/Machines/MaterialNode.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 08015ac72e..7aed6a0171 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -63,11 +63,18 @@ class MaterialNode(ContainerNode): elif not self.variant.machine.has_materials: qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) else: - # Need to find the qualities that specify a material profile with the same material type. - qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. + if self.variant.machine.has_variants: + # Need to find the qualities that specify a material profile with the same material type. + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. + else: + qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition, material=self.container_id) if not qualities: my_material_type = self.material_type - qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) + if self.variant.machine.has_variants: + qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) + else: + qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) + for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) if not qualities: # No quality profiles found. Go by GUID then. From fc67090a2fa39c15c80d026c250d8474673aad81 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 16:15:00 +0200 Subject: [PATCH 468/994] Fix crash when adding UMO --- cura/Machines/MaterialNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 7aed6a0171..53596f8db3 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -73,8 +73,8 @@ class MaterialNode(ContainerNode): if self.variant.machine.has_variants: qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) else: - qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) - + qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition = self.variant.machine.quality_definition) + qualities_any_material = [metadata for metadata in qualities_any_material if metadata.get("global_quality", "False") != "True"] for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) if not qualities: # No quality profiles found. Go by GUID then. From 37aca7d361c671586ede4d8fcb7dee52111deabd Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 19 Sep 2019 17:00:16 +0200 Subject: [PATCH 469/994] Menu items should be removed by index, not by object. part of CURA-6791 --- resources/qml/Menus/MaterialMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 1f85fa33ff..53c5d5ad37 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -56,7 +56,7 @@ Menu exclusiveGroup: group } onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) // TODO: This ain't gonna work, removeItem() takes an index, not object + onObjectRemoved: menu.removeItem(index) } MenuSeparator {} @@ -78,7 +78,7 @@ Menu onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) } onObjectAdded: genericMenu.insertItem(index, object) - onObjectRemoved: genericMenu.removeItem(object) // TODO: This ain't gonna work, removeItem() takes an index, not object + onObjectRemoved: genericMenu.removeItem(index) } } From a69a3945144e29aa7593251b1681e899c91a9da2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 17:16:15 +0200 Subject: [PATCH 470/994] Fix container tree generation for machines that only have global profiles CURA-6775 --- cura/Machines/MaterialNode.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 53596f8db3..f39ece4f8c 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -74,14 +74,20 @@ class MaterialNode(ContainerNode): qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) else: qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition = self.variant.machine.quality_definition) - qualities_any_material = [metadata for metadata in qualities_any_material if metadata.get("global_quality", "False") != "True"] for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): - qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) + qualities.extend((quality for quality in qualities_any_material if quality.get("material") == material_metadata["id"])) + if not qualities: # No quality profiles found. Go by GUID then. my_guid = self.guid for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid): qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) + if not qualities: + # There are still some machines that should use global profiles in the extruder, so do that now. + # These are mostly older machines that haven't received updates (so single extruder machines without specific qualities + # but that do have materials and profiles specific to that machine) + qualities.extend([quality for quality in qualities_any_material if quality.get("global_quality", "False") != "False"]) + for quality in qualities: quality_id = quality["id"] if quality_id not in self.qualities: From 71a22bf19400d545a89354dd5c6131683803671a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 17:31:18 +0200 Subject: [PATCH 471/994] Fix few profiles that didn't have global_quality set --- resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg | 1 + resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg | 1 + resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg | 1 + resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg | 1 + resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg | 1 + resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg | 1 + resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg | 1 + .../quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg | 1 + 8 files changed, 8 insertions(+) diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index e548bfb29e..5eba875cbb 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = coarse weight = 3 +global_quality = True [values] layer_height = 0.08 diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index 1a905f3097..105bb5aac3 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index 5f95f5f6f2..9c83be7d63 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = extra_high weight = 0 +global_quality = True [values] layer_height = 0.02 diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 83139afcda..820657ba8b 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = high weight = 1 +global_quality = True [values] layer_height = 0.04 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 2ebea78d6a..2ff1636ee4 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = normal weight = 0 +global_quality = True [values] layer_height = 0.06 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index 5e2be0dc9e..58a11be8b5 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = draft weight = -2 +global_quality = True [values] brim_width = 4.0 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 7fd0e24423..a502f38e24 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = high weight = 1 +global_quality = True [values] brim_width = 4.0 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index 424eda97bf..51a497f47b 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -8,6 +8,7 @@ setting_version = 10 type = quality quality_type = normal weight = 0 +global_quality = True [values] brim_width = 4.0 From 729019a2dcbf126458486d08e5f4b9a84dec3cbd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Sep 2019 16:15:19 +0200 Subject: [PATCH 472/994] Don't use material manager to reset the material after uninstalling material package This class is deprecated. Contributes to issue CURA-6776. --- plugins/Toolbox/src/Toolbox.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 641340db17..08b6c80b1d 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -360,12 +360,14 @@ class Toolbox(QObject, Extension): @pyqtSlot() def resetMaterialsQualitiesAndUninstall(self) -> None: application = CuraApplication.getInstance() - material_manager = application.getMaterialManager() machine_manager = application.getMachineManager() container_tree = ContainerTree.getInstance() for global_stack, extruder_nr, container_id in self._package_used_materials: - default_material_node = material_manager.getDefaultMaterial(global_stack, extruder_nr, global_stack.extruders[extruder_nr].variant.getName()) + extruder = global_stack.extruderList[int(extruder_nr)] + approximate_diameter = extruder.getApproximateMaterialDiameter() + variant_node = container_tree.machines[global_stack.definition.getId()].variants[extruder.variant.getName()] + default_material_node = variant_node.preferredMaterial(approximate_diameter) machine_manager.setMaterial(extruder_nr, default_material_node, global_stack = global_stack) for global_stack, extruder_nr, container_id in self._package_used_qualities: variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] From 105e782e75d3a58ea54d04dff87f488717e5d8f7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Sep 2019 16:17:48 +0200 Subject: [PATCH 473/994] Remove unused imports to MaterialManager Contributes to issue CURA-6776. --- cura/Machines/QualityManager.py | 1 - cura/Settings/ContainerManager.py | 1 - cura/Settings/CuraStackBuilder.py | 1 - 3 files changed, 3 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 6c54a6890d..4aa88d6775 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -48,7 +48,6 @@ class QualityManager(QObject): def __init__(self, parent = None) -> None: super().__init__(parent) application = cura.CuraApplication.CuraApplication.getInstance() - self._material_manager = application.getMaterialManager() self._container_registry = application.getContainerRegistry() self._empty_quality_container = application.empty_quality_container diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 140412076e..3154a88adf 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -23,7 +23,6 @@ from UM.Settings.InstanceContainer import InstanceContainer import cura.CuraApplication from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.MaterialManager import MaterialManager if TYPE_CHECKING: from cura.CuraApplication import CuraApplication diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 33b0fd8d2e..2cc427e253 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -10,7 +10,6 @@ from UM.Settings.InstanceContainer import InstanceContainer from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MachineNode import MachineNode -from cura.Machines.MaterialManager import MaterialManager from .GlobalStack import GlobalStack from .ExtruderStack import ExtruderStack From cc9115b3d3cf5968bae845443750c5e0531f0d63 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Sep 2019 16:27:58 +0200 Subject: [PATCH 474/994] Don't use material manager to reset material Use the container tree. Contributes to issue CURA-6776. --- cura/UI/MachineSettingsManager.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cura/UI/MachineSettingsManager.py b/cura/UI/MachineSettingsManager.py index 7ecd9ed65f..671bb0ece0 100644 --- a/cura/UI/MachineSettingsManager.py +++ b/cura/UI/MachineSettingsManager.py @@ -2,11 +2,12 @@ # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional, TYPE_CHECKING - from PyQt5.QtCore import QObject, pyqtSlot from UM.i18n import i18nCatalog +from cura.Machines.ContainerTree import ContainerTree + if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -42,7 +43,7 @@ class MachineSettingsManager(QObject): # it was moved to the machine manager instead. Now this method just calls the machine manager. self._application.getMachineManager().setActiveMachineExtruderCount(extruder_count) - # Function for the Machine Settings panel (QML) to update after the usre changes "Number of Extruders". + # Function for the Machine Settings panel (QML) to update after the user changes "Number of Extruders". # # fieldOfView: The Ultimaker 2 family (not 2+) does not have materials in Cura by default, because the material is # to be set on the printer. But when switching to Marlin flavor, the printer firmware can not change/insert material @@ -51,8 +52,6 @@ class MachineSettingsManager(QObject): @pyqtSlot() def updateHasMaterialsMetadata(self): machine_manager = self._application.getMachineManager() - material_manager = self._application.getMaterialManager() - global_stack = machine_manager.activeMachine definition = global_stack.definition @@ -76,7 +75,10 @@ class MachineSettingsManager(QObject): # set materials for position in extruder_positions: if has_materials: - material_node = material_manager.getDefaultMaterial(global_stack, position, None) + extruder = global_stack.extruderList[int(position)] + approximate_diameter = extruder.getApproximateMaterialDiameter() + variant_node = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[extruder.variant.getName()] + material_node = variant_node.preferredMaterial(approximate_diameter) machine_manager.setMaterial(position, material_node) self.forceUpdate() From 12043df3678cbc088396de8df8a3317975e588b7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Sep 2019 17:01:13 +0200 Subject: [PATCH 475/994] Don't use material manager to find or remove materials That remove function in the material manager was very weird... Contributes to issue CURA-6776. --- cura/Machines/MaterialManager.py | 2 +- plugins/3MFReader/ThreeMFWorkspaceReader.py | 23 ++++----------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index dc9fb55902..83be6941ea 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -255,7 +255,7 @@ class MaterialManager(QObject): for result in results: container_registry.removeContainer(result.getMetaDataEntry("id", "")) - @pyqtSlot("QVariant", result=bool) + @pyqtSlot("QVariant", result = bool) def canMaterialBeRemoved(self, material_node: "MaterialNode"): # Check if the material is active in any extruder train. In that case, the material shouldn't be removed! # In the future we might enable this again, but right now, it's causing a ton of issues if we do (since it diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 0d1118ed64..67e48d0c23 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -575,7 +575,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): @call_on_qt_thread def read(self, file_name): application = CuraApplication.getInstance() - material_manager = application.getMaterialManager() archive = zipfile.ZipFile(file_name, "r") @@ -673,7 +672,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if self._resolve_strategies["material"] == "override": # Remove the old materials and then deserialize the one from the project root_material_id = material_container.getMetaDataEntry("base_file") - material_manager.removeMaterialByRootId(root_material_id) + application.getContainerRegistry().removeContainer(root_material_id) elif self._resolve_strategies["material"] == "new": # Note that we *must* deserialize it with a new ID, as multiple containers will be # auto created & added. @@ -727,8 +726,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if self._machine_info.quality_changes_info is None: return - application = CuraApplication.getInstance() - # If we have custom profiles, load them quality_changes_name = self._machine_info.quality_changes_info.name if self._machine_info.quality_changes_info is not None: @@ -957,9 +954,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_stack.variant = node.container def _applyMaterials(self, global_stack, extruder_stack_dict): - application = CuraApplication.getInstance() - material_manager = application.getMaterialManager() - + machine_node = ContainerTree.getInstance().machines[global_stack] for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: continue @@ -970,18 +965,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): root_material_id = extruder_info.root_material_id root_material_id = self._old_new_materials.get(root_material_id, root_material_id) - build_plate_id = global_stack.variant.getId() - - # get material diameter of this extruder - machine_material_diameter = extruder_stack.getCompatibleMaterialDiameter() - material_node = material_manager.getMaterialNode(global_stack.definition.getId(), - extruder_stack.variant.getName(), - build_plate_id, - machine_material_diameter, - root_material_id) - - if material_node is not None and material_node.container is not None: - extruder_stack.material = material_node.container # type: InstanceContainer + material_node = machine_node.variants[extruder_stack.variant.getName()].materials[root_material_id] + extruder_stack.material = material_node.container # type: InstanceContainer def _applyChangesToMachine(self, global_stack, extruder_stack_dict): # Clear all first From 4a68e7ec955c93bd7229dadcf882e263bef99c51 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 20 Sep 2019 09:34:40 +0200 Subject: [PATCH 476/994] Fix favorite materials without material manager We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough. Contributes to issue CURA-6776. --- cura/Machines/Models/BaseMaterialsModel.py | 6 ++++ .../Models/MaterialManagementModel.py | 36 +++++++++++++++++-- .../Preferences/Materials/MaterialsSlot.qml | 9 ++--- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 7dcdb7fd57..89a50ba39d 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -45,6 +45,7 @@ class BaseMaterialsModel(ListModel): # Update this model when switching machines, when adding materials or changing their metadata. self._machine_manager.activeStackChanged.connect(self._update) ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged) + self._application.getMaterialManagementModel().favoritesChanged.connect(self._update) self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") @@ -115,6 +116,11 @@ class BaseMaterialsModel(ListModel): return self._update() + ## Triggered when the list of favorite materials is changed. + def _favoritesChanged(self, material_base_file: str) -> None: + if material_base_file in self._available_materials: + self._update() + ## This is an abstract method that needs to be implemented by the specific # models themselves. def _update(self): diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index a0b61e0b9b..16ef4b81e8 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. import copy # To duplicate materials. -from PyQt5.QtCore import QObject, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. +from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. from typing import Any, Dict, Optional, TYPE_CHECKING import uuid # To generate new GUIDs for new materials. @@ -23,6 +23,11 @@ catalog = i18nCatalog("cura") # This class handles the actions in that page, such as creating new materials, # renaming them, etc. class MaterialManagementModel(QObject): + ## Triggered when a favorite is added or removed. + # \param The base file of the material is provided as parameter when this + # emits. + favoritesChanged = pyqtSignal(str) + ## Can a certain material be deleted, or is it still in use in one of the # container stacks anywhere? # @@ -178,4 +183,31 @@ class MaterialManagementModel(QObject): } self.duplicateMaterial(preferred_material_node, new_base_id = new_id, new_metadata = new_metadata) - return new_id \ No newline at end of file + return new_id + + ## Adds a certain material to the favorite materials. + # \param material_base_file The base file of the material to add. + @pyqtSlot(str) + def addFavorite(self, material_base_file: str) -> None: + application = cura.CuraApplication.CuraApplication.getInstance() + favorites = application.getPreferences().getValue("cura/favorite_materials").split(";") + if material_base_file not in favorites: + favorites.append(material_base_file) + application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites)) + application.saveSettings() + self.favoritesChanged.emit(material_base_file) + + ## Removes a certain material from the favorite materials. + # + # If the material was not in the favorite materials, nothing happens. + @pyqtSlot(str) + def removeFavorite(self, material_base_file: str) -> None: + application = cura.CuraApplication.CuraApplication.getInstance() + favorites = application.getPreferences().getValue("cura/favorite_materials").split(";") + try: + favorites.remove(material_base_file) + application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites)) + application.saveSettings() + self.favoritesChanged.emit(material_base_file) + except ValueError: # Material was not in the favorites list. + Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file)) \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index 0e60bb6558..c6691460cf 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -82,11 +82,12 @@ Rectangle { if (materialSlot.is_favorite) { - CuraApplication.getMaterialManager().removeFavorite(material.root_material_id) - return + CuraApplication.getMaterialManagementModel().removeFavorite(material.root_material_id) + } + else + { + CuraApplication.getMaterialManagementModel().addFavorite(material.root_material_id) } - CuraApplication.getMaterialManager().addFavorite(material.root_material_id) - return } style: ButtonStyle { From 3479a3df76365cfc927c3f8a3421b116132bf684 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 20 Sep 2019 09:45:55 +0200 Subject: [PATCH 477/994] Fix _applyVariants using variant manager The variant manager doesn't get properly filled any more. Contributes to issue CURA-6776. --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 36 +++++++-------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 67e48d0c23..46584aea98 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -920,41 +920,27 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_stack.userChanges.setProperty(key, "value", value) def _applyVariants(self, global_stack, extruder_stack_dict): - application = CuraApplication.getInstance() - variant_manager = application.getVariantManager() + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + # Take the global variant from the machine info if available. if self._machine_info.variant_info is not None: - parser = self._machine_info.variant_info.parser - variant_name = parser["general"]["name"] - - variant_type = VariantType.BUILD_PLATE - - node = variant_manager.getVariantNode(global_stack.definition.getId(), variant_name, variant_type) - if node is not None and node.container is not None: - global_stack.variant = node.container + variant_name = self._machine_info.variant_info.parser["general"]["name"] + global_stack.variant = machine_node.variants[variant_name].container for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: continue extruder_info = self._machine_info.extruder_info_dict[position] if extruder_info.variant_info is None: - # If there is no variant_info, try to use the default variant. Otherwise, leave it be. - machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] - node = machine_node.variants[machine_node.preferred_variant_name] - if node is not None and node.container is not None: - extruder_stack.variant = node.container - continue - parser = extruder_info.variant_info.parser - - variant_name = parser["general"]["name"] - variant_type = VariantType.NOZZLE - - node = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[variant_name] - if node is not None and node.container is not None: - extruder_stack.variant = node.container + # If there is no variant_info, try to use the default variant. Otherwise, any available variant. + node = machine_node.variants.get(machine_node.preferred_variant_name, next(iter(machine_node.variants.values()))) + else: + variant_name = extruder_info.variant_info.parser["general"]["name"] + node = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[variant_name] + extruder_stack.variant = node.container def _applyMaterials(self, global_stack, extruder_stack_dict): - machine_node = ContainerTree.getInstance().machines[global_stack] + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: continue From cb7d99d2dc3e8ecb796dc2ac03f6f850e2afebdc Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 20 Sep 2019 11:56:08 +0200 Subject: [PATCH 478/994] Revert "Make 3MF-reader aware of setting-version for introduction Intent." This reverts commit 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab. Should have been (and is now) done in the version upgrade instead. --- cura/Settings/CuraContainerStack.py | 21 +------------------ plugins/3MFReader/ThreeMFWorkspaceReader.py | 23 +++++++++------------ 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index c1c2544c6e..c141ac9b0e 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Any, cast, Dict, List, Optional +from typing import Any, cast, List, Optional from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject from UM.Application import Application @@ -364,22 +364,3 @@ class _ContainerIndexes: # Reverse lookup: type -> index TypeIndexMap = dict([(v, k) for k, v in IndexTypeMap.items()]) - - # Mapping to old values before Intent introduction. Used for reading older versions of input files. - IndexToOldIndexMap = { - UserChanges: 0, - QualityChanges: 1, - Intent: -1, # Wasn't there in the old 'format'! - Quality: 2, - Material: 3, - Variant: 4, - DefinitionChanges: 5, - Definition: 6, - } - - # Reverse lookup: old index -> new index - OldIndexToIndexMap = dict([(v, k) for k, v in IndexToOldIndexMap.items()]) - - @classmethod - def getIndexMapping(cls, setting_version: int) -> Dict[int, int]: - return dict([(x, x) for x in list(range(99))]) if setting_version >= 10 else cls.IndexToOldIndexMap diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 46584aea98..d5bc4e74c6 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -371,8 +371,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Get quality type parser = ConfigParser(interpolation = None) parser.read_string(serialized) - index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) - quality_container_id = parser["containers"][str(index_map_version[_ContainerIndexes.Quality])] + quality_container_id = parser["containers"][str(_ContainerIndexes.Quality)] quality_type = "empty_quality" if quality_container_id not in ("empty", "empty_quality"): quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"] @@ -382,11 +381,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): serialized = GlobalStack._updateSerialized(serialized, global_stack_file) parser = ConfigParser(interpolation = None) parser.read_string(serialized) - index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) - definition_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.DefinitionChanges])] + definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)] if definition_changes_id not in ("empty", "empty_definition_changes"): self._machine_info.definition_changes_info = instance_container_info_dict[definition_changes_id] - user_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.UserChanges])] + user_changes_id = parser["containers"][str(_ContainerIndexes.UserChanges)] if user_changes_id not in ("empty", "empty_user_changes"): self._machine_info.user_changes_info = instance_container_info_dict[user_changes_id] @@ -396,8 +394,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info = ExtruderInfo() extruder_info.position = position - variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] - material_id = parser["containers"][str(index_map_version[_ContainerIndexes.Material])] + variant_id = parser["containers"][str(_ContainerIndexes.Variant)] + material_id = parser["containers"][str(_ContainerIndexes.Material)] if variant_id not in ("empty", "empty_variant"): extruder_info.variant_info = instance_container_info_dict[variant_id] if material_id not in ("empty", "empty_material"): @@ -405,7 +403,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info.root_material_id = root_material_id self._machine_info.extruder_info_dict[position] = extruder_info else: - variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] + variant_id = parser["containers"][str(_ContainerIndexes.Variant)] if variant_id not in ("empty", "empty_variant"): self._machine_info.variant_info = instance_container_info_dict[variant_id] QCoreApplication.processEvents() # Ensure that the GUI does not freeze. @@ -417,14 +415,13 @@ class ThreeMFWorkspaceReader(WorkspaceReader): serialized = ExtruderStack._updateSerialized(serialized, extruder_stack_file) parser = ConfigParser(interpolation = None) parser.read_string(serialized) - index_map_version = _ContainerIndexes.getIndexMapping(int(parser["metadata"]["setting_version"])) # The check should be done for the extruder stack that's associated with the existing global stack, # and those extruder stacks may have different IDs. # So we check according to the positions position = parser["metadata"]["position"] - variant_id = parser["containers"][str(index_map_version[_ContainerIndexes.Variant])] - material_id = parser["containers"][str(index_map_version[_ContainerIndexes.Material])] + variant_id = parser["containers"][str(_ContainerIndexes.Variant)] + material_id = parser["containers"][str(_ContainerIndexes.Material)] extruder_info = ExtruderInfo() extruder_info.position = position @@ -438,11 +435,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): root_material_id = reverse_material_id_dict[material_id] extruder_info.root_material_id = root_material_id - definition_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.DefinitionChanges])] + definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)] if definition_changes_id not in ("empty", "empty_definition_changes"): extruder_info.definition_changes_info = instance_container_info_dict[definition_changes_id] - user_changes_id = parser["containers"][str(index_map_version[_ContainerIndexes.UserChanges])] + user_changes_id = parser["containers"][str(_ContainerIndexes.UserChanges)] if user_changes_id not in ("empty", "empty_user_changes"): extruder_info.user_changes_info = instance_container_info_dict[user_changes_id] self._machine_info.extruder_info_dict[position] = extruder_info From c9e281f52e377fc51dc06c273eaa637aa75d2e61 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 20 Sep 2019 14:51:37 +0200 Subject: [PATCH 479/994] Add preference for general/restore_window_geometry See https://github.com/Ultimaker/Uranium/pull/523 --- resources/qml/Preferences/GeneralPage.qml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 4adb3e72d2..cdbe5d7e0e 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -94,6 +94,8 @@ UM.PreferencesPage zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) UM.Preferences.resetPreference("view/top_layer_count"); topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count")) + UM.Preferences.resetPreference("general/restore_window_geometry") + restoreWindowPositionCheckbox.checked = boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) UM.Preferences.resetPreference("general/camera_perspective_mode") var defaultCameraMode = UM.Preferences.getValue("general/camera_perspective_mode") @@ -458,6 +460,21 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "Should Cura open at the location it was closed?") + + CheckBox + { + id: restoreWindowPositionCheckbox + text: catalog.i18nc("@option:check", "Restore window position on start") + checked: boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) + onCheckedChanged: UM.Preferences.setValue("general/restore_window_geometry", checked) + } + } + UM.TooltipArea { width: childrenRect.width From 61527e082e46b352ca3e0cd9d0c262f30b647195 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 23 Sep 2019 09:59:57 +0200 Subject: [PATCH 480/994] Mock ContainerTree instead of ContainerRegistry The intent models are now using the ContainerTree to build themselves rather than the registry. --- tests/Settings/TestCuraStackBuilder.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 7a1e05296c..2fec1f659b 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -66,8 +66,6 @@ def test_createMachine(application, container_registry, definition_container, gl quality_manager.getQualityGroups = MagicMock(return_value = {"normal": quality_group}) application.getContainerRegistry = MagicMock(return_value=container_registry) - application.getVariantManager = MagicMock(return_value = variant_manager) - application.getQualityManager = MagicMock(return_value = quality_manager) application.empty_material_container = material_instance_container application.empty_quality_container = quality_container application.empty_intent_container = intent_container From 18d93d0b7bcebf253c48a031d82af591e893ae2b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 23 Sep 2019 10:40:02 +0200 Subject: [PATCH 481/994] Fix UM2 extended variants CURA-6775 --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 4 ++++ ...0.25.inst.cfg => ultimaker2_extended_olsson_0.25.inst.cfg} | 2 +- ...d_0.4.inst.cfg => ultimaker2_extended_olsson_0.4.inst.cfg} | 2 +- ...d_0.6.inst.cfg => ultimaker2_extended_olsson_0.6.inst.cfg} | 2 +- ...d_0.8.inst.cfg => ultimaker2_extended_olsson_0.8.inst.cfg} | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) rename resources/variants/{ultimaker2_extended_0.25.inst.cfg => ultimaker2_extended_olsson_0.25.inst.cfg} (82%) rename resources/variants/{ultimaker2_extended_0.4.inst.cfg => ultimaker2_extended_olsson_0.4.inst.cfg} (82%) rename resources/variants/{ultimaker2_extended_0.6.inst.cfg => ultimaker2_extended_olsson_0.6.inst.cfg} (82%) rename resources/variants/{ultimaker2_extended_0.8.inst.cfg => ultimaker2_extended_olsson_0.8.inst.cfg} (82%) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index e24766933f..678066c3e8 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -8,6 +8,10 @@ _renamed_container_id_map = { "ultimaker2_0.4": "ultimaker2_olsson_0.4", "ultimaker2_0.6": "ultimaker2_olsson_0.6", "ultimaker2_0.8": "ultimaker2_olsson_0.8", + "ultimaker2_extended_0.25": "ultimaker2_extended_olsson_0.25", + "ultimaker2_extended_0.4": "ultimaker2_extended_olsson_0.4", + "ultimaker2_extended_0.6": "ultimaker2_extended_olsson_0.6", + "ultimaker2_extended_0.8": "ultimaker2_extended_olsson_0.8", } diff --git a/resources/variants/ultimaker2_extended_0.25.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg similarity index 82% rename from resources/variants/ultimaker2_extended_0.25.inst.cfg rename to resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg index e1ee26fe52..a18cf745f7 100644 --- a/resources/variants/ultimaker2_extended_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.25 mm version = 4 -definition = ultimaker2_extended +definition = ultimaker2_extended_olsson [metadata] setting_version = 10 diff --git a/resources/variants/ultimaker2_extended_0.4.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg similarity index 82% rename from resources/variants/ultimaker2_extended_0.4.inst.cfg rename to resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg index 3e008cc4c4..65d86c419d 100644 --- a/resources/variants/ultimaker2_extended_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm version = 4 -definition = ultimaker2_extended +definition = ultimaker2_extended_olsson [metadata] setting_version = 10 diff --git a/resources/variants/ultimaker2_extended_0.6.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg similarity index 82% rename from resources/variants/ultimaker2_extended_0.6.inst.cfg rename to resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg index 8cde95416a..274b371448 100644 --- a/resources/variants/ultimaker2_extended_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm version = 4 -definition = ultimaker2_extended +definition = ultimaker2_extended_olsson [metadata] setting_version = 10 diff --git a/resources/variants/ultimaker2_extended_0.8.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg similarity index 82% rename from resources/variants/ultimaker2_extended_0.8.inst.cfg rename to resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg index b1d6acb100..9b43296950 100644 --- a/resources/variants/ultimaker2_extended_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm version = 4 -definition = ultimaker2_extended +definition = ultimaker2_extended_olsson [metadata] setting_version = 10 From 1aa6708677d3355a802900182b851eaa7b1edf0f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 23 Sep 2019 10:59:31 +0200 Subject: [PATCH 482/994] Fix typing --- cura/Machines/Models/MaterialManagementModel.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 16ef4b81e8..b4f3bb9889 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -39,7 +39,7 @@ class MaterialManagementModel(QObject): # \param material_node The ContainerTree node of the material to check. # \return Whether or not the material can be removed. @pyqtSlot("QVariant", result = bool) - def canMaterialBeRemoved(self, material_node: "MaterialNode"): + def canMaterialBeRemoved(self, material_node: "MaterialNode") -> bool: container_registry = CuraContainerRegistry.getInstance() ids_to_remove = {metadata.get("id", "") for metadata in container_registry.findInstanceContainersMetadata(base_file = material_node.base_file)} for extruder_stack in container_registry.findContainerStacks(type = "extruder_train"): @@ -85,7 +85,8 @@ class MaterialManagementModel(QObject): # \param new_metadata Metadata for the new material. If not provided, this # will be duplicated from the original material. # \return The root material ID of the duplicate material. - def duplicateMaterialByBaseFile(self, base_file: str, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + def duplicateMaterialByBaseFile(self, base_file: str, new_base_id: Optional[str] = None, + new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: container_registry = CuraContainerRegistry.getInstance() root_materials = container_registry.findContainers(id = base_file) @@ -149,7 +150,8 @@ class MaterialManagementModel(QObject): # will be duplicated from the original material. # \return The root material ID of the duplicate material. @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: "MaterialNode", new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + def duplicateMaterial(self, material_node: "MaterialNode", new_base_id: Optional[str] = None, + new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: return self.duplicateMaterialByBaseFile(material_node.base_file, new_base_id, new_metadata) ## Create a new material by cloning the preferred material for the current @@ -210,4 +212,4 @@ class MaterialManagementModel(QObject): application.saveSettings() self.favoritesChanged.emit(material_base_file) except ValueError: # Material was not in the favorites list. - Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file)) \ No newline at end of file + Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file)) From a4ed51342c52e91d0d5f52979cae1f28a9f4389f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 23 Sep 2019 11:18:47 +0200 Subject: [PATCH 483/994] Fix favorite not being checked properly in MaterialMenu CURA-6804 --- resources/qml/Menus/MaterialMenu.qml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 53c5d5ad37..a574e240d3 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -14,8 +14,7 @@ Menu property int extruderIndex: 0 property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] - - property string activeMaterialId: Cura.MachineManager.activeMachine.extruders[extruderIndex].material.id + property string activeMaterialId: Cura.MachineManager.activeMachine.extruderList[extruderIndex].material.id property bool updateModels: true Cura.FavoriteMaterialsModel { @@ -53,7 +52,7 @@ Menu checkable: true checked: model.root_material_id === menu.currentRootMaterialId onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) - exclusiveGroup: group + exclusiveGroup: favoriteGroup // One favorite and one item from the others can be active at the same time. } onObjectAdded: menu.insertItem(index, object) onObjectRemoved: menu.removeItem(index) @@ -127,10 +126,16 @@ Menu onObjectRemoved: menu.removeItem(object) } - ExclusiveGroup { + ExclusiveGroup + { id: group } + ExclusiveGroup + { + id: favoriteGroup + } + MenuSeparator {} MenuItem From ddab8e204a89f26455d576fa1352a7b7a0e87eb3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 23 Sep 2019 11:43:48 +0200 Subject: [PATCH 484/994] Add typing CURA-6800 --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b6b426f602..6cea18507b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -613,8 +613,8 @@ class MachineManager(QObject): return False return Util.parseBool(global_container_stack.quality.getMetaDataEntry("is_experimental", False)) - @pyqtProperty(str, notify=activeIntentChanged) - def activeIntentCategory(self): + @pyqtProperty(str, notify = activeIntentChanged) + def activeIntentCategory(self) -> str: global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: From 79f938a39c54041ec690173bf7ed5b73a28876b2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 23 Sep 2019 11:44:09 +0200 Subject: [PATCH 485/994] Add intent for project saving summary CURA-6800 --- .../qml/Dialogs/WorkspaceSummaryDialog.qml | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index b8c9560b3a..d23c3d6580 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -1,10 +1,10 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.1 +import QtQuick 2.10 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 import UM 1.2 as UM import Cura 1.0 as Cura @@ -256,6 +256,23 @@ UM.Dialog width: Math.floor(scroll.width / 3) | 0 } } + + // Intent + Row + { + width: parent.width + height: childrenRect.height + Label + { + text: catalog.i18nc("@action:label", "Intent") + width: Math.floor(scroll.width / 3) | 0 + } + Label + { + text: Cura.MachineManager.activeIntentCategory + width: Math.floor(scroll.width / 3) | 0 + } + } } } } From f6cd807bb39adb611025d5b358a084431e72d394 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Mon, 23 Sep 2019 11:50:34 +0200 Subject: [PATCH 486/994] Adds Ultimaker S5 intent profiles Initial version, for merging with master. --- ...um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 32 +++++++++++++++++++ ..._s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 30 +++++++++++++++++ ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 30 +++++++++++++++++ ...um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 32 +++++++++++++++++++ ..._s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 30 +++++++++++++++++ ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 30 +++++++++++++++++ ...m_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 32 +++++++++++++++++++ ...s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 30 +++++++++++++++++ ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 30 +++++++++++++++++ 9 files changed, 276 insertions(+) create mode 100644 resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..9075315841 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..db4a001daf --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..12ba19a5d2 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..1c92150f8a --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_pla +variant = AA 0.4 + +[values] +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +infill_sparse_density = 15 +fill_perimeter_gaps = nowhere +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +speed_layer_0 = 20 +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..87da046a9f --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..8175cd7c4a --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..40cef6653d --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..1aed2360e5 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..f2246a6d09 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall_0 = =jerk_print +jerk_wall_x = =jerk_print +line_width = =machine_nozzle_size +speed_print = 30 +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_print +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 From 521c55f267a000919a302e4b36051def63116ad0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 23 Sep 2019 11:51:25 +0200 Subject: [PATCH 487/994] Delete the aluminum profiles We're not using them (and we're not going to either). Since they are now causing issues, it's a perfect time to kill them --- ...s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg | 36 ---------- ..._s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg | 35 ---------- ...5_aa0.4_aluminum_ABS_High_Quality.inst.cfg | 34 --------- ...aa0.4_aluminum_ABS_Normal_Quality.inst.cfg | 34 --------- ...5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg | 54 -------------- ...s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg | 52 -------------- ..._aa0.4_aluminum_CPEP_High_Quality.inst.cfg | 55 --------------- ...a0.4_aluminum_CPEP_Normal_Quality.inst.cfg | 54 -------------- ...s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg | 35 ---------- ..._s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg | 33 --------- ...5_aa0.4_aluminum_CPE_High_Quality.inst.cfg | 34 --------- ...aa0.4_aluminum_CPE_Normal_Quality.inst.cfg | 32 --------- ..._s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg | 69 ------------------ ...m_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg | 69 ------------------ ...s5_aa0.4_aluminum_PC_High_Quality.inst.cfg | 70 ------------------- ..._aa0.4_aluminum_PC_Normal_Quality.inst.cfg | 68 ------------------ ..._s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg | 65 ----------------- ...m_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg | 67 ------------------ ..._aa0.4_aluminum_PP_Normal_Quality.inst.cfg | 68 ------------------ ...s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg | 28 -------- ...0.8_aluminum_ABS_Superdraft_Print.inst.cfg | 28 -------- ...a0.8_aluminum_ABS_Verydraft_Print.inst.cfg | 28 -------- ...s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg | 45 ------------ ....8_aluminum_CPEP_Superdraft_Print.inst.cfg | 44 ------------ ...0.8_aluminum_CPEP_Verydraft_Print.inst.cfg | 44 ------------ ...s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg | 31 -------- ...0.8_aluminum_CPE_Superdraft_Print.inst.cfg | 32 --------- ...a0.8_aluminum_CPE_Verydraft_Print.inst.cfg | 31 -------- ...m_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg | 38 ---------- ...a0.8_aluminum_PC_Superdraft_Print.inst.cfg | 36 ---------- ...aa0.8_aluminum_PC_Verydraft_Print.inst.cfg | 38 ---------- ..._s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg | 54 -------------- ...a0.8_aluminum_PP_Superdraft_Print.inst.cfg | 55 --------------- ...aa0.8_aluminum_PP_Verydraft_Print.inst.cfg | 53 -------------- 34 files changed, 1549 deletions(-) delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg deleted file mode 100644 index ec6e79d7e5..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg +++ /dev/null @@ -1,36 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_abs -variant = AA 0.4 -buildplate = Aluminum - -[values] -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 20 -material_initial_print_temperature = =material_print_temperature - 15 -material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False -skin_overlap = 20 -speed_print = 60 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 35 / 60) -speed_wall = =math.ceil(speed_print * 45 / 60) -speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -wall_thickness = 1 - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 50 / 60) - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg deleted file mode 100644 index 93d8284be6..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg +++ /dev/null @@ -1,35 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = fast -weight = -1 -material = generic_abs -variant = AA 0.4 -buildplate = Aluminum - -[values] -cool_min_speed = 7 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 15 -material_initial_print_temperature = =material_print_temperature - 15 -material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False -speed_print = 60 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 60) -speed_wall = =math.ceil(speed_print * 40 / 60) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 45 / 60) - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg deleted file mode 100644 index 347fc338d6..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = high -weight = 1 -material = generic_abs -variant = AA 0.4 -buildplate = Aluminum - -[values] -cool_min_speed = 12 -machine_nozzle_cool_down_speed = 0.8 -machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 15 -material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False -speed_print = 50 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 40 / 50) - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg deleted file mode 100644 index c34dd711cf..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_abs -variant = AA 0.4 -buildplate = Aluminum - -[values] -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 15 -material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False -speed_print = 55 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 55) -speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 40 / 55) - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.17 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg deleted file mode 100644 index a858c1bb83..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg +++ /dev/null @@ -1,54 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -cool_fan_speed_max = 80 -cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) -infill_overlap = 0 -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 10 -material_print_temperature_layer_0 = =material_print_temperature -multiple_mesh_overlap = 0 -prime_tower_enable = True -prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 -retraction_extrusion_window = 1 -retraction_hop = 0.2 -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -skin_overlap = 20 -speed_layer_0 = 20 -speed_print = 50 -speed_topbottom = =math.ceil(speed_print * 40 / 50) - -speed_wall = =math.ceil(speed_print * 50 / 50) -speed_wall_0 = =math.ceil(speed_wall * 40 / 50) -support_bottom_distance = =support_z_distance -support_z_distance = =layer_height -wall_0_inset = 0 -wall_thickness = 1 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.17 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg deleted file mode 100644 index f12d62fcbf..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg +++ /dev/null @@ -1,52 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -cool_fan_speed_max = 80 -cool_min_speed = 6 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) -infill_overlap = 0 -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 10 -material_print_temperature_layer_0 = =material_print_temperature -multiple_mesh_overlap = 0 -prime_tower_enable = True -prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 -retraction_extrusion_window = 1 -retraction_hop = 0.2 -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -skin_overlap = 20 -speed_layer_0 = 20 -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) - -speed_wall = =math.ceil(speed_print * 45 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -support_bottom_distance = =support_z_distance -support_z_distance = =layer_height -wall_0_inset = 0 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg deleted file mode 100644 index 34e0ec37e9..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = high -weight = 1 -material = generic_cpe_plus -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -cool_fan_speed_max = 50 -cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) -infill_overlap = 0 -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 2 -material_print_temperature_layer_0 = =material_print_temperature -multiple_mesh_overlap = 0 -prime_tower_enable = True -prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 -retraction_extrusion_window = 1 -retraction_hop = 0.2 -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -skin_overlap = 20 -speed_layer_0 = 20 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 35) - -speed_wall = =math.ceil(speed_print * 35 / 40) -speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_bottom_distance = =support_z_distance -support_z_distance = =layer_height -wall_0_inset = 0 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.17 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg deleted file mode 100644 index c168aa4f09..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg +++ /dev/null @@ -1,54 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_cpe_plus -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -cool_fan_speed_max = 50 -cool_min_speed = 7 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) -infill_overlap = 0 -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =material_print_temperature -multiple_mesh_overlap = 0 -prime_tower_enable = True -prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 -retraction_extrusion_window = 1 -retraction_hop = 0.2 -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -skin_overlap = 20 -speed_layer_0 = 20 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 35) - -speed_wall = =math.ceil(speed_print * 35 / 40) -speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_bottom_distance = =support_z_distance -support_z_distance = =layer_height -wall_0_inset = 0 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg deleted file mode 100644 index 104dad4847..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg +++ /dev/null @@ -1,35 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_cpe -variant = AA 0.4 -buildplate = Aluminum - -[values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 -skin_overlap = 20 -speed_print = 60 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 35 / 60) -speed_wall = =math.ceil(speed_print * 45 / 60) -speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -wall_thickness = 1 - - -infill_pattern = triangles -speed_infill = =math.ceil(speed_print * 50 / 60) - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg deleted file mode 100644 index 6daecad13d..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg +++ /dev/null @@ -1,33 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = fast -weight = -1 -material = generic_cpe -variant = AA 0.4 -buildplate = Aluminum - -[values] -cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 -speed_print = 60 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 60) -speed_wall = =math.ceil(speed_print * 40 / 60) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_pattern = triangles -speed_infill = =math.ceil(speed_print * 50 / 60) - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg deleted file mode 100644 index 5d315d69c4..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = high -weight = 1 -material = generic_cpe -variant = AA 0.4 -buildplate = Aluminum - -[values] -cool_min_speed = 12 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 -speed_print = 50 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = triangles -speed_infill = =math.ceil(speed_print * 40 / 50) - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg deleted file mode 100644 index cae73b1ac9..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_cpe -variant = AA 0.4 -buildplate = Aluminum - -[values] -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 -speed_print = 55 -speed_layer_0 = 20 -speed_topbottom = =math.ceil(speed_print * 30 / 55) -speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = triangles -speed_infill = =math.ceil(speed_print * 45 / 55) - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg deleted file mode 100644 index d8eb03af4c..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_pc -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -adhesion_type = brim -brim_width = 20 -cool_fan_full_at_height = =layer_height_0 + layer_height -cool_fan_speed_max = 90 -cool_min_layer_time_fan_speed_max = 5 -cool_min_speed = 6 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -infill_overlap = 0 -infill_overlap_mm = 0.05 -infill_pattern = triangles -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -ooze_shield_angle = 40 -prime_tower_enable = True -prime_tower_wipe_enabled = True -raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) -retraction_count_max = 80 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 15 -skin_overlap = 30 -speed_layer_0 = 25 -speed_print = 50 -speed_topbottom = 25 -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 25 / 40) -support_bottom_distance = =support_z_distance -support_interface_density = 87.5 -support_interface_pattern = lines -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) -wall_thickness = 1.2 - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg deleted file mode 100644 index 67c5218bb4..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = fast -weight = -1 -material = generic_pc -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -adhesion_type = brim -brim_width = 20 -cool_fan_full_at_height = =layer_height_0 + layer_height -cool_fan_speed_max = 85 -cool_min_layer_time_fan_speed_max = 5 -cool_min_speed = 7 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -infill_overlap_mm = 0.05 -infill_pattern = triangles -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -ooze_shield_angle = 40 -prime_tower_enable = True -prime_tower_wipe_enabled = True -raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) -retraction_count_max = 80 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 15 -skin_overlap = 30 -speed_layer_0 = 25 -speed_print = 50 -speed_topbottom = 25 - -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 25 / 40) -support_bottom_distance = =support_z_distance -support_interface_density = 87.5 -support_interface_pattern = lines -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) -wall_thickness = 1.2 - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg deleted file mode 100644 index 0573f3e687..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg +++ /dev/null @@ -1,70 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = high -weight = 1 -material = generic_pc -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -adhesion_type = brim -brim_width = 20 -cool_fan_full_at_height = =layer_height_0 + layer_height -cool_fan_speed_max = 50 -cool_min_layer_time_fan_speed_max = 5 -cool_min_speed = 8 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -infill_overlap = 0 -infill_overlap_mm = 0.05 -infill_pattern = triangles -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature - 10 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -ooze_shield_angle = 40 -prime_tower_enable = True -prime_tower_wipe_enabled = True -raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) -retraction_count_max = 80 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 15 -skin_overlap = 30 -speed_layer_0 = 25 -speed_print = 50 -speed_topbottom = 25 - -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 25 / 40) -support_bottom_distance = =support_z_distance -support_interface_density = 87.5 -support_interface_pattern = lines -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) -wall_thickness = 1.2 - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg deleted file mode 100644 index e7c47c0db1..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_pc -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -adhesion_type = brim -brim_width = 20 -cool_fan_full_at_height = =layer_height_0 + layer_height -cool_fan_speed_max = 50 -cool_min_layer_time_fan_speed_max = 5 -cool_min_speed = 5 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -infill_overlap = 0 -infill_pattern = triangles -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -ooze_shield_angle = 40 -prime_tower_enable = True -prime_tower_wipe_enabled = True -raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) -retraction_count_max = 80 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 15 -skin_overlap = 30 -speed_layer_0 = 25 -speed_print = 50 -speed_topbottom = 25 - -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 25 / 40) -support_bottom_distance = =support_z_distance -support_interface_density = 87.5 -support_interface_pattern = lines -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) -wall_thickness = 1.2 - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.17 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg deleted file mode 100644 index 03d5de33a6..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg +++ /dev/null @@ -1,65 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_pp -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 20 -cool_fan_speed_max = 100 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 7 -cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) -infill_overlap = 0 -infill_pattern = tetrahedral -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature - 5 -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_size = 16 -prime_tower_wipe_enabled = True -retraction_count_max = 12 -retraction_extra_prime_amount = 0.8 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 18 -speed_equalize_flow_enabled = True -speed_layer_0 = 15 -speed_print = 25 -speed_topbottom = =math.ceil(speed_print * 25 / 25) -speed_travel_layer_0 = 50 -speed_wall = =math.ceil(speed_print * 25 / 25) -speed_wall_0 = =math.ceil(speed_wall * 25 / 25) -support_angle = 50 -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -wall_0_inset = 0 -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 - -default_material_bed_temperature = 95 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg deleted file mode 100644 index c5f6c5ee1c..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg +++ /dev/null @@ -1,67 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = fast -weight = -1 -material = generic_pp -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 20 -cool_fan_speed_max = 100 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 7 -cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) -infill_overlap = 0 -infill_pattern = tetrahedral -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature - 12 -material_initial_print_temperature = =material_print_temperature - 2 -material_print_temperature = =default_material_print_temperature - 13 -material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_size = 16 -prime_tower_wipe_enabled = True -retraction_count_max = 12 -retraction_extra_prime_amount = 0.8 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 18 -speed_equalize_flow_enabled = True -speed_layer_0 = 15 -speed_print = 25 -speed_topbottom = =math.ceil(speed_print * 25 / 25) - -speed_travel_layer_0 = 50 -speed_wall = =math.ceil(speed_print * 25 / 25) -speed_wall_0 = =math.ceil(speed_wall * 25 / 25) -support_angle = 50 -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 1.1 -wall_0_inset = 0 -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 - -default_material_bed_temperature = 95 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg deleted file mode 100644 index 51cc7acb82..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_pp -variant = AA 0.4 -buildplate = Aluminum - -[values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 20 -cool_fan_speed_max = 100 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 7 -cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) -infill_overlap = 0 -infill_pattern = tetrahedral -infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = =default_material_print_temperature - 15 -material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_size = 16 -prime_tower_wipe_enabled = True -retraction_count_max = 12 -retraction_extra_prime_amount = 0.8 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 -retraction_prime_speed = 18 -speed_equalize_flow_enabled = True -speed_layer_0 = 15 -speed_print = 25 -speed_topbottom = =math.ceil(speed_print * 25 / 25) - -speed_travel_layer_0 = 50 -speed_wall = =math.ceil(speed_print * 25 / 25) -speed_wall_0 = =math.ceil(speed_wall * 25 / 25) -support_angle = 50 -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 1 -wall_0_inset = 0 -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 - -default_material_bed_temperature = 95 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg deleted file mode 100644 index ecc1c245de..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_abs -variant = AA 0.8 -buildplate = Aluminum - -[values] -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 -speed_print = 50 -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg deleted file mode 100644 index c9a1c5e45e..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = superdraft -weight = -4 -material = generic_abs -variant = AA 0.8 -buildplate = Aluminum - -[values] -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 25 -material_standby_temperature = 100 -speed_print = 50 -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg deleted file mode 100644 index c40daede80..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = verydraft -weight = -3 -material = generic_abs -variant = AA 0.8 -buildplate = Aluminum - -[values] -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 22 -material_standby_temperature = 100 -speed_print = 50 -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False - -material_bed_temperature_layer_0 = 100 -default_material_bed_temperature = 90 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg deleted file mode 100644 index 08379f1a3e..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg +++ /dev/null @@ -1,45 +0,0 @@ -[general] -version = 4 -name = Fast - Experimental -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus -variant = AA 0.8 -buildplate = Aluminum -is_experimental = True - -[values] -brim_width = 14 -cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_heat_up_speed = 1.4 -material_print_temperature = =default_material_print_temperature - 10 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -retraction_hop = 0.1 -retraction_hop_enabled = False -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 15 -speed_topbottom = =math.ceil(speed_print * 35 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) -support_z_distance = =layer_height -top_bottom_thickness = 1.2 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg deleted file mode 100644 index 24d401ae22..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe_plus -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 14 -cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_heat_up_speed = 1.4 -material_print_temperature = =default_material_print_temperature - 5 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -retraction_hop = 0.1 -retraction_hop_enabled = False -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 8 -speed_topbottom = =math.ceil(speed_print * 35 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) -support_z_distance = =layer_height -top_bottom_thickness = 1.2 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg deleted file mode 100644 index b5c20fbd13..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe_plus -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 14 -cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_heat_up_speed = 1.4 -material_print_temperature = =default_material_print_temperature - 7 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -retraction_hop = 0.1 -retraction_hop_enabled = False -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 10 -speed_topbottom = =math.ceil(speed_print * 35 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) -support_z_distance = =layer_height -top_bottom_thickness = 1.2 - -material_bed_temperature_layer_0 = 115 -default_material_bed_temperature = 105 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg deleted file mode 100644 index 2956e42cd4..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_cpe -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 15 -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 15 -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 25 / 40) -speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg deleted file mode 100644 index 5b4e5b7a0b..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 15 -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 30 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -jerk_travel = 50 - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg deleted file mode 100644 index 7d1266c5cd..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 15 -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature + 17 -material_standby_temperature = 100 -prime_tower_enable = True -retraction_combing_max_distance = 50 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 25 / 40) -speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 - -material_bed_temperature_layer_0 = 90 -default_material_bed_temperature = 80 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg deleted file mode 100644 index aa65156503..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -version = 4 -name = Fast - Experimental -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_pc -variant = AA 0.8 -buildplate = Aluminum -is_experimental = True - -[values] -brim_width = 10 -cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature - 5 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -raft_airgap = 0.5 -raft_margin = 15 -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 15 -speed_topbottom = =math.ceil(speed_print * 25 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg deleted file mode 100644 index 46dfb3a324..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg +++ /dev/null @@ -1,36 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = superdraft -weight = -4 -material = generic_pc -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 10 -cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -raft_airgap = 0.5 -raft_margin = 15 -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 8 -speed_topbottom = =math.ceil(speed_print * 25 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg deleted file mode 100644 index d987343aa5..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = verydraft -weight = -3 -material = generic_pc -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 10 -cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 -material_print_temperature = =default_material_print_temperature - 2 -material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 -raft_airgap = 0.5 -raft_margin = 15 -skin_overlap = 0 -speed_layer_0 = 15 -speed_print = 50 -speed_slowdown_layers = 10 -speed_topbottom = =math.ceil(speed_print * 25 / 50) -speed_wall = =math.ceil(speed_print * 40 / 50) -speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) - -material_bed_temperature_layer_0 = 125 -default_material_bed_temperature = 115 -prime_blob_enable = False -layer_height_0 = 0.3 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg deleted file mode 100644 index 8cac0a388d..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg +++ /dev/null @@ -1,54 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = draft -weight = -2 -material = generic_pp -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 25 -cool_min_layer_time_fan_speed_max = 6 -cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) -infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature = =default_material_print_temperature - 2 -material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 -multiple_mesh_overlap = 0.2 -prime_tower_enable = True -prime_tower_flow = 100 -retract_at_layer_change = False -retraction_count_max = 12 -retraction_extra_prime_amount = 0.5 -retraction_hop = 0.5 -retraction_min_travel = 1.5 -retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - -speed_wall_x = =math.ceil(speed_wall * 30 / 30) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) -support_offset = =line_width -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False -wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) -wall_thickness = 1.6 - -default_material_bed_temperature = 95 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg deleted file mode 100644 index 2b0f026acd..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = superdraft -weight = -4 -material = generic_pp -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 25 -cool_min_layer_time_fan_speed_max = 6 -cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) -infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature = =default_material_print_temperature + 2 -material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 -multiple_mesh_overlap = 0.2 -prime_tower_enable = True -prime_tower_flow = 100 -retract_at_layer_change = False -retraction_count_max = 12 -retraction_extra_prime_amount = 0.5 -retraction_hop = 0.5 -retraction_min_travel = 1.5 -retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - -speed_wall_x = =math.ceil(speed_wall * 30 / 30) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) -support_offset = =line_width -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False -wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) -wall_thickness = 1.6 - -default_material_bed_temperature = 95 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg deleted file mode 100644 index c33a5ccff0..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg +++ /dev/null @@ -1,53 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = quality -quality_type = verydraft -weight = -3 -material = generic_pp -variant = AA 0.8 -buildplate = Aluminum - -[values] -brim_width = 25 -cool_min_layer_time_fan_speed_max = 6 -cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) -infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 -multiple_mesh_overlap = 0.2 -prime_tower_enable = True -prime_tower_flow = 100 -retract_at_layer_change = False -retraction_count_max = 12 -retraction_extra_prime_amount = 0.5 -retraction_hop = 0.5 -retraction_min_travel = 1.5 -retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - -speed_wall_x = =math.ceil(speed_wall * 30 / 30) -support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) -support_offset = =line_width -switch_extruder_prime_speed = 15 -switch_extruder_retraction_amount = 20 -switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False -wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) -wall_thickness = 1.6 - -default_material_bed_temperature = 95 From 8d7772608918f1634083d0db42952f36c9b3a5ab Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 23 Sep 2019 13:05:34 +0200 Subject: [PATCH 488/994] Add intent logic for project loading CURA-6800 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 23 ++++++++++++++++++- plugins/3MFReader/WorkspaceDialog.py | 11 +++++++++ plugins/3MFReader/WorkspaceDialog.qml | 25 ++++++++++++++++----- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index d5bc4e74c6..1eca090c3f 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -24,11 +24,11 @@ from UM.Job import Job from UM.Preferences import Preferences from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.VariantType import VariantType from cura.Settings.CuraStackBuilder import CuraStackBuilder from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderStack import ExtruderStack from cura.Settings.GlobalStack import GlobalStack +from cura.Settings.IntentManager import IntentManager from cura.Settings.CuraContainerStack import _ContainerIndexes from cura.CuraApplication import CuraApplication from cura.Utils.Threading import call_on_qt_thread @@ -65,6 +65,7 @@ class MachineInfo: self.metadata_dict = {} # type: Dict[str, str] self.quality_type = None + self.intent_category = None self.custom_quality_name = None self.quality_changes_info = None self.variant_info = None @@ -84,6 +85,7 @@ class ExtruderInfo: self.definition_changes_info = None self.user_changes_info = None + self.intent_info = None ## Base implementation for reading 3MF workspace files. @@ -266,6 +268,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): instance_container_files = [name for name in cura_file_names if name.endswith(self._instance_container_suffix)] quality_name = "" custom_quality_name = "" + intent_name = "" + intent_category = "" num_settings_overridden_by_quality_changes = 0 # How many settings are changed by the quality changes num_user_settings = 0 quality_changes_conflict = False @@ -323,6 +327,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): elif container_type == "quality": if not quality_name: quality_name = parser["general"]["name"] + elif container_type == "intent": + if not intent_name: + intent_name = parser["general"]["name"] + intent_category = parser["metadata"]["intent_category"] elif container_type == "user": num_user_settings += len(parser["values"]) elif container_type in self._ignored_instance_container_types: @@ -444,6 +452,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): extruder_info.user_changes_info = instance_container_info_dict[user_changes_id] self._machine_info.extruder_info_dict[position] = extruder_info + intent_id = parser["containers"][str(_ContainerIndexes.Intent)] + if intent_id not in ("empty", "empty_intent"): + extruder_info.intent_info = instance_container_info_dict[intent_id] + if not machine_conflict and containers_found_dict["machine"]: if position not in global_stack.extruders: continue @@ -508,6 +520,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._machine_info.definition_id = machine_definition_id self._machine_info.quality_type = quality_type self._machine_info.custom_quality_name = quality_name + self._machine_info.intent_category = intent_category if machine_conflict and not self._is_same_machine_type: machine_conflict = False @@ -528,6 +541,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setNumVisibleSettings(num_visible_settings) self._dialog.setQualityName(quality_name) self._dialog.setQualityType(quality_type) + self._dialog.setIntentName(intent_name) self._dialog.setNumSettingsOverriddenByQualityChanges(num_settings_overridden_by_quality_changes) self._dialog.setNumUserSettings(num_user_settings) self._dialog.setActiveMode(active_mode) @@ -965,10 +979,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # prepare the quality to select self._quality_changes_to_apply = None self._quality_type_to_apply = None + self._intent_category_to_apply = None if self._machine_info.quality_changes_info is not None: self._quality_changes_to_apply = self._machine_info.quality_changes_info.name else: self._quality_type_to_apply = self._machine_info.quality_type + self._intent_category_to_apply = self._machine_info.intent_category # Set enabled/disabled for extruders for position, extruder_stack in extruder_stack_dict.items(): @@ -1018,6 +1034,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if quality_group is not None: machine_manager.setQualityGroup(quality_group, no_dialog = True) + # Also apply intent if available + available_intent_category_list = IntentManager.getInstance().currentAvailableIntentCategories() + if self._intent_category_to_apply is not None and self._intent_category_to_apply in available_intent_category_list: + machine_manager.setIntentByCategory(self._intent_category_to_apply) + # Notify everything/one that is to notify about changes. global_stack.containersChanged.emit(global_stack.getTop()) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 332c57ceb1..3df7f1f570 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -43,6 +43,7 @@ class WorkspaceDialog(QObject): self._quality_name = "" self._num_settings_overridden_by_quality_changes = 0 self._quality_type = "" + self._intent_name = "" self._machine_name = "" self._machine_type = "" self._variant_type = "" @@ -60,6 +61,7 @@ class WorkspaceDialog(QObject): hasVisibleSettingsFieldChanged = pyqtSignal() numSettingsOverridenByQualityChangesChanged = pyqtSignal() qualityTypeChanged = pyqtSignal() + intentNameChanged = pyqtSignal() machineNameChanged = pyqtSignal() materialLabelsChanged = pyqtSignal() objectsOnPlateChanged = pyqtSignal() @@ -166,6 +168,15 @@ class WorkspaceDialog(QObject): self._quality_name = quality_name self.qualityNameChanged.emit() + @pyqtProperty(str, notify = intentNameChanged) + def intentName(self) -> str: + return self._intent_name + + def setIntentName(self, intent_name: str) -> None: + if self._intent_name != intent_name: + self._intent_name = intent_name + self.intentNameChanged.emit() + @pyqtProperty(str, notify=activeModeChanged) def activeMode(self): return self._active_mode diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 58d881c915..2b881b0fae 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -1,10 +1,10 @@ // Copyright (c) 2016 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.1 +import QtQuick 2.10 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 import UM 1.1 as UM @@ -24,7 +24,7 @@ UM.Dialog onClosing: manager.notifyClosed() onVisibleChanged: { - if(visible) + if (visible) { machineResolveComboBox.currentIndex = 0 qualityChangesResolveComboBox.currentIndex = 0 @@ -223,6 +223,21 @@ UM.Dialog } } Row + { + width: parent.width + height: childrenRect.height + Label + { + text: catalog.i18nc("@action:label", "Intent") + width: (parent.width / 3) | 0 + } + Label + { + text: manager.intentName + width: (parent.width / 3) | 0 + } + } + Row { width: parent.width height: manager.numUserSettings != 0 ? childrenRect.height : 0 From 7e3f265068d4c2260026448aeacac0e6345c17cf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 23 Sep 2019 13:18:11 +0200 Subject: [PATCH 489/994] Add a function to add a MachineNode to the tree. This solves the issue that machines created by the stack builder broke the material updating CURA-6791 --- cura/Machines/ContainerTree.py | 25 +++++++++++++++---------- cura/Settings/CuraStackBuilder.py | 3 +-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 2af022601a..b5d91ca8c1 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -74,6 +74,18 @@ class ContainerTree: extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) + # Add a machine node by the id of it's definition. + # This is automatically called by the _machineAdded function, but it's sometimes needed to add a machine node + # faster than would have been done when waiting on any signals (for instance; when creating an entirely new machine) + def addMachineNodeByDefinitionId(self, definition_id: str) -> None: + if definition_id in self.machines: + return # Already have this definition ID. + + start_time = time.time() + self.machines[definition_id] = MachineNode(definition_id) + self.machines[definition_id].materialsChanged.connect(self.materialsChanged) + Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) + ## Builds the initial container tree. def _loadAll(self): Logger.log("i", "Building container tree.") @@ -90,16 +102,9 @@ class ContainerTree: Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - definition_start_time)) Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) - + ## When a printer gets added, we need to build up the tree for that container. - def _machineAdded(self, container_stack: ContainerInterface): + def _machineAdded(self, container_stack: ContainerInterface) -> None: if not isinstance(container_stack, GlobalStack): return # Not our concern. - definition_id = container_stack.definition.getId() - if definition_id in self.machines: - return # Already have this definition ID. - - start_time = time.time() - self.machines[definition_id] = MachineNode(definition_id) - self.machines[definition_id].materialsChanged.connect(self.materialsChanged) - Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) \ No newline at end of file + self.addMachineNodeByDefinitionId(container_stack.definition.getId()) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 2cc427e253..b82c5141fb 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -40,8 +40,7 @@ class CuraStackBuilder: # The container tree listens to the containerAdded signal to add the definition and build the tree, # but that signal is emitted with a delay which might not have passed yet. # Therefore we must make sure that it's manually added here. - if machine_definition.getId() not in container_tree.machines: - container_tree.machines[machine_definition.getId()] = MachineNode(machine_definition.getId()) + container_tree.addMachineNodeByDefinitionId(machine_definition.getId()) machine_node = container_tree.machines[machine_definition.getId()] generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName()) From 3a2c5b247328ca5c451372654d0c789f37a62e3d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 23 Sep 2019 13:26:21 +0200 Subject: [PATCH 490/994] Fix test for stack builder --- tests/Settings/TestCuraStackBuilder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 2fec1f659b..cf4496d0a9 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -82,7 +82,8 @@ def test_createMachine(application, container_registry, definition_container, gl machine_node.preferredGlobalQuality = MagicMock(return_value = quality_node) quality_node.container = quality_container - with patch("cura.Settings.CuraStackBuilder.MachineNode", MagicMock(return_value = machine_node)): + # Patch out the creation of MachineNodes since that isn't under test (and would require quite a bit of extra setup) + with patch("cura.Machines.ContainerTree.MachineNode", MagicMock(return_value = machine_node)): with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): machine = CuraStackBuilder.createMachine("Whatever", "Test Definition") From 355248447727c1c0ba0f7b62b581127427b68eaa Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 23 Sep 2019 14:49:04 +0200 Subject: [PATCH 491/994] Add missing newline CURA-6805 --- resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 1c92150f8a..5ed11ab78e 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -29,4 +29,4 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_print speed_layer_0 = 20 -wall_line_width_x = =line_width \ No newline at end of file +wall_line_width_x = =line_width From 7d40d962e85405d13503a6b7cf4e7c65cd8d5656 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 23 Sep 2019 15:03:24 +0200 Subject: [PATCH 492/994] Mock ContainerTree instead of ContainerRegistry to test intent manager Because now it relies on the container tree instead of querying the registry anew every time. --- tests/TestIntentManager.py | 67 ++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 97ea663344..2fd06372ce 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -11,10 +11,50 @@ from cura.Machines.QualityGroup import QualityGroup from tests.Settings.MockContainer import MockContainer +mocked_intent_metadata = [ + {"id": "um3_aa4_pla_smooth_normal", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", + "material_id": "generic_pla", "intent_category": "smooth", "quality_type": "normal"}, + {"id": "um3_aa4_pla_strong_abnorm", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", + "material_id": "generic_pla", "intent_category": "strong", "quality_type": "abnorm"}] # type:List[Dict[str, str]] + +mocked_qualitygroup_metadata = { + "normal": QualityGroup("um3_aa4_pla_normal", "normal"), + "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] + @pytest.fixture() def mock_container_tree() -> MagicMock: container_tree = MagicMock() container_tree.getCurrentQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata) + container_tree.machines = { + "ultimaker3": MagicMock( + variants = { + "AA 0.4": MagicMock( + materials = { + "generic_pla": MagicMock( + qualities = { + "um3_aa4_pla_normal": MagicMock( + intents = { + "smooth": MagicMock( + intent_category = "smooth", + getMetadata = MagicMock(return_value = mocked_intent_metadata[0]) + ) + } + ), + "um3_aa4_pla_abnorm": MagicMock( + intents = { + "strong": MagicMock( + intent_category = "strong", + getMetadata = MagicMock(return_value = mocked_intent_metadata[1]) + ) + } + ) + } + ) + } + ) + } + ) + } return container_tree @pytest.fixture() @@ -27,17 +67,6 @@ def intent_manager(application, extruder_manager, machine_manager, container_reg manager = IntentManager() return manager -mocked_intent_metadata = [ - {"id": "um3_aa4_pla_smooth_normal", "GUID": "abcxyz", "definition": "ultimaker3", "variant": "AA 0.4", - "material_id": "generic_pla", "intent_category": "smooth", "quality_type": "normal"}, - {"id": "um3_aa4_pla_strong_abnorm", "GUID": "defqrs", "definition": "ultimaker3", "variant": "AA 0.4", - "material_id": "generic_pla", "intent_category": "strong", "quality_type": "abnorm"}] # type:List[Dict[str, str]] - -mocked_qualitygroup_metadata = { - "normal": QualityGroup("um3_aa4_pla_normal", "normal"), - "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] - - def mockFindMetadata(**kwargs) -> List[Dict[str, Any]]: if "id" in kwargs: return [x for x in mocked_intent_metadata if x["id"] == kwargs["id"]] @@ -82,16 +111,12 @@ def doSetup(application, extruder_manager, container_registry, global_stack) -> extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b]) -def test_intentCategories(application, intent_manager, container_registry): - # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). - container_registry.findContainersMetadata = MagicMock(return_value = mocked_intent_metadata) - - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] - assert "default" in categories, "default should always be in categories" - assert "strong" in categories, "strong should be in categories" - assert "smooth" in categories, "smooth should be in categories" +def test_intentCategories(intent_manager, mock_container_tree): + with patch("cura.Machines.ContainerTree.ContainerTree.getInstance", MagicMock(return_value = mock_container_tree)): + categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] + assert "default" in categories, "default should always be in categories" + assert "strong" in categories, "strong should be in categories" + assert "smooth" in categories, "smooth should be in categories" def test_getCurrentAvailableIntents(application, extruder_manager, intent_manager, container_registry, global_stack, mock_container_tree): From 557746a8326d570ab80bb5ec47e720a2a2aeebc3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 23 Sep 2019 15:17:15 +0200 Subject: [PATCH 493/994] Partial fix for intent manager not finding correct profile in test Only in test. --- cura/Settings/MachineManager.py | 8 +++++--- tests/Machines/TestContainerTree.py | 2 -- tests/Settings/MockContainer.py | 12 +++++++++--- tests/TestIntentManager.py | 10 ++++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b6b426f602..40077a3414 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1028,12 +1028,14 @@ class MachineManager(QObject): def _onMaterialNameChanged(self) -> None: self.activeMaterialChanged.emit() + ## Get the signals that signal that the containers changed for all stacks. + # + # This includes the global stack and all extruder stacks. So if any + # container changed anywhere. def _getContainerChangedSignals(self) -> List[Signal]: if self._global_container_stack is None: return [] - stacks = ExtruderManager.getInstance().getActiveExtruderStacks() - stacks.append(self._global_container_stack) - return [ s.containersChanged for s in stacks ] + return [s.containersChanged for s in ExtruderManager.getInstance().getActiveExtruderStacks() + [self._global_container_stack]] @pyqtSlot(str, str, str) def setSettingForAllExtruders(self, setting_name: str, property_name: str, property_value: str) -> None: diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 1c7b0de1da..a60036b33a 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -4,8 +4,6 @@ from UM.Settings.DefinitionContainer import DefinitionContainer from cura.Machines.ContainerTree import ContainerTree from cura.Settings.GlobalStack import GlobalStack -import cura.CuraApplication # DEBUG! - def createMockedStack(definition_id: str): result = MagicMock(spec = GlobalStack) diff --git a/tests/Settings/MockContainer.py b/tests/Settings/MockContainer.py index 0f3b85293c..533938c631 100644 --- a/tests/Settings/MockContainer.py +++ b/tests/Settings/MockContainer.py @@ -50,10 +50,16 @@ class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): return default ## Gets a human-readable name for this container. - # - # \return Always returns "MockContainer". + # \return The name from the metadata, or "MockContainer" if there was no + # name provided. def getName(self): - return "MockContainer" + return self._metadata.get("name", "MockContainer") + + ## Get whether a container stack is enabled or not. + # \return Always returns True. + @property + def isEnabled(self): + return True ## Get whether the container item is stored on a read only location in the filesystem. # diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 2fd06372ce..5ed2656df4 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -21,7 +21,7 @@ mocked_qualitygroup_metadata = { "normal": QualityGroup("um3_aa4_pla_normal", "normal"), "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] -@pytest.fixture() +@pytest.fixture def mock_container_tree() -> MagicMock: container_tree = MagicMock() container_tree.getCurrentQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata) @@ -57,7 +57,7 @@ def mock_container_tree() -> MagicMock: } return container_tree -@pytest.fixture() +@pytest.fixture def intent_manager(application, extruder_manager, machine_manager, container_registry, global_stack) -> IntentManager: application.getExtruderManager = MagicMock(return_value = extruder_manager) application.getGlobalContainerStack = MagicMock(return_value = global_stack) @@ -98,16 +98,18 @@ def doSetup(application, extruder_manager, container_registry, global_stack) -> qualitygroup.node_for_global = MagicMock(name = "Node for global") global_stack.definition = MockContainer({"id": "ultimaker3"}) - application.getGlobalContainerStack = MagicMock(return_value = global_stack) extruder_stack_a = MockContainer({"id": "Extruder The First"}) extruder_stack_a.variant = MockContainer({"name": "AA 0.4"}) + extruder_stack_a.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_a.material = MockContainer({"base_file": "generic_pla"}) extruder_stack_b = MockContainer({"id": "Extruder II: Plastic Boogaloo"}) extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) + extruder_stack_b.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) + global_stack.extruderList = [extruder_stack_a, extruder_stack_b] - application.getGlobalContainerStack().extruderList = [extruder_stack_a, extruder_stack_b] + application.getGlobalContainerStack = MagicMock(return_value = global_stack) extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b]) From 4dc918c64726c89b87e98dc83e937729ed64fbe5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 23 Sep 2019 17:09:54 +0200 Subject: [PATCH 494/994] Fix unit test --- tests/TestIntentManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 5ed2656df4..a82de1273d 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -62,6 +62,7 @@ def intent_manager(application, extruder_manager, machine_manager, container_reg application.getExtruderManager = MagicMock(return_value = extruder_manager) application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getMachineManager = MagicMock(return_value = machine_manager) + machine_manager.setIntentByCategory = MagicMock() with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): manager = IntentManager() From f469b994716d596d756d6b56866eee3836fe922e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 24 Sep 2019 11:57:50 +0200 Subject: [PATCH 495/994] Create intent nodes based on the selected quality type Previously it would use the material type from the material, but since the material from the node can be different to that of the quality, we need to use the one from quality instead (This is due to the fallback system) CURA-6807 --- cura/Machines/QualityNode.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 7980f4ed63..8bb2870ceb 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -23,15 +23,17 @@ class QualityNode(ContainerNode): my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = container_id)[0] self.quality_type = my_metadata["quality_type"] - + # The material type of the parent doesn't need to be the same as this due to generic fallbacks. + self._material = my_metadata.get("material") self._loadAll() def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() + # Find all intent profiles that fit the current configuration. from cura.Machines.MachineNode import MachineNode if not isinstance(self.parent, MachineNode): # Not a global profile. - for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file, quality_type = self.quality_type): + for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self._material, quality_type = self.quality_type): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) From a741530db27b90013eedab8649bb6e22858938b7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 24 Sep 2019 13:17:36 +0200 Subject: [PATCH 496/994] Also ensure that the container tree is used when selecting an intent CURA-6807 --- cura/Settings/IntentManager.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 1a73fb818c..973381504d 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -133,10 +133,29 @@ class IntentManager(QObject): if global_stack is None: return current_definition_id = global_stack.definition.getId() + machine_node = ContainerTree.getInstance().machines[current_definition_id] for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") - intent = application.getContainerRegistry().findContainers(definition = current_definition_id, variant = nozzle_name, material = material_id, quality_type = quality_type, intent_category = intent_category) + + material_node = machine_node.variants[nozzle_name].materials[material_id] + + # Since we want to switch to a certain quality type, check the tree if we have one. + quality_node = None + for q_node in material_node.qualities.values(): + if q_node.quality_type == quality_type: + quality_node = q_node + + if quality_node is None: + Logger.log("w", "Unable to find quality_type [%s] for extruder [%s]", quality_type, extruder_stack.getId()) + continue + + # Check that quality node if we can find a matching intent. + intent_id = None + for id, intent_node in quality_node.intents.items(): + if intent_node.intent_category == intent_category: + intent_id = id + intent = application.getContainerRegistry().findContainers(id = intent_id) if intent: extruder_stack.intent = intent[0] else: From 78effbb191572c7f5aaa4f6a3543b259090f8c14 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 24 Sep 2019 15:57:30 +0200 Subject: [PATCH 497/994] Upgrade globals as well. part of CURA-6802 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 1eca090c3f..b9b4e1da2c 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -356,6 +356,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # To simplify this, only check if the global stack exists or not global_stack_id = self._stripFileToId(global_stack_file) serialized = archive.open(global_stack_file).read().decode("utf-8") + serialized = GlobalStack._updateSerialized(serialized, global_stack_file) machine_name = self._getMachineNameFromSerializedStack(serialized) self._machine_info.metadata_dict = self._getMetaDataDictFromSerializedStack(serialized) From 8412288cb2f857fe5c70fe99c0638cc5bcc3b56a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 24 Sep 2019 16:39:45 +0200 Subject: [PATCH 498/994] Ignore leftover buildplate/'global' variants. part of CURA-6802 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index b9b4e1da2c..dd35484c31 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -937,7 +937,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Take the global variant from the machine info if available. if self._machine_info.variant_info is not None: variant_name = self._machine_info.variant_info.parser["general"]["name"] - global_stack.variant = machine_node.variants[variant_name].container + if variant_name in machine_node.variants: + global_stack.variant = machine_node.variants[variant_name].container + else: + Logger.log("w", "Could not find global variant '{0}'.".format(variant_name)) for position, extruder_stack in extruder_stack_dict.items(): if position not in self._machine_info.extruder_info_dict: From f2e518da6be564530acef66c07683dababa018fb Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Sep 2019 08:23:57 +0200 Subject: [PATCH 499/994] Fix code style and typing --- .../Models/CustomQualityProfilesDropDownMenuModel.py | 6 ++++-- cura/Machines/QualityChangesGroup.py | 3 ++- .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index 3ade02120d..8fe9b26517 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -7,10 +7,12 @@ import cura.CuraApplication # Imported this way to prevent circular references. from cura.Machines.ContainerTree import ContainerTree from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel + ## This model is used for the custom profile items in the profile drop down # menu. class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): - def _update(self): + + def _update(self) -> None: Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) active_global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine @@ -31,4 +33,4 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): item_list.append(item) - self.setItems(item_list) \ No newline at end of file + self.setItems(item_list) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 65ebb71f4c..f2bb0f737d 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -10,7 +10,8 @@ from typing import Any, Dict, Optional # contains an instance container for the global stack and one instance # container per extruder. class QualityChangesGroup(QObject): - def __init__(self, name: str, quality_type: str, intent_category: str, parent = None) -> None: + + def __init__(self, name: str, quality_type: str, intent_category: str, parent: Optional["QObject"] = None) -> None: super().__init__(parent) self.name = name self.quality_type = quality_type diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index cff4e3e7a6..2d5f880344 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -103,7 +103,7 @@ Popup text: model.name + " - " + model.layer_height + " mm" checked: { - if(Cura.MachineManager.hasCustomQuality) + if (Cura.MachineManager.hasCustomQuality) { // When user created profile is active, no quality tickbox should be active. return false; From f395c92732f3ee5680b80b90d72372023240bb92 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Sep 2019 08:28:21 +0200 Subject: [PATCH 500/994] Fix custom profile menu CURA-6599 --- cura/Machines/QualityChangesGroup.py | 8 +++++++- .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index f2bb0f737d..cd88368e2a 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -1,9 +1,11 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject from typing import Any, Dict, Optional +from PyQt5.QtCore import QObject, pyqtSlot + + ## Data struct to group several quality changes instance containers together. # # Each group represents one "custom profile" as the user sees it, which @@ -20,5 +22,9 @@ class QualityChangesGroup(QObject): self.metadata_for_global = {} # type: Dict[str, Any] self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] + @pyqtSlot(result = str) + def getName(self) -> str: + return self.name + def __str__(self) -> str: return "{class_name}[{name}, available = {is_available}]".format(class_name = self.__class__.__name__, name = self.name, is_available = self.is_available) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 2d5f880344..5ebf653332 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -163,7 +163,6 @@ Popup //Add all the custom profiles. Repeater { - visible: false model: Cura.CustomQualityProfilesDropDownMenuModel MenuButton { @@ -172,8 +171,8 @@ Popup width: parent.width checkable: true visible: model.available - text: model.name + " - " + model.layer_height + " mm" - checked: Cura.MachineManager.activeQualityChangesGroup == model.quality_changes_group + text: model.name + checked: Cura.MachineManager.activeQualityChangesGroup.getName() == model.quality_changes_group.getName() ButtonGroup.group: buttonGroup } } From d1330e5ffa88d11d30e44bd64f4ed044eace6591 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Sep 2019 08:52:53 +0200 Subject: [PATCH 501/994] Fix updating custom quality menu model CURA-6599 --- .../CustomQualityProfilesDropDownMenuModel.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index 8fe9b26517..1ab7e21700 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -1,17 +1,35 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, TYPE_CHECKING + from UM.Logger import Logger import cura.CuraApplication # Imported this way to prevent circular references. from cura.Machines.ContainerTree import ContainerTree from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel +if TYPE_CHECKING: + from PyQt5.QtCore import QObject + from UM.Settings.Interfaces import ContainerInterface + ## This model is used for the custom profile items in the profile drop down # menu. class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): + def __init__(self, parent: Optional["QObject"] = None) -> None: + super().__init__(parent) + + container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() + container_registry.containerAdded.connect(self._qualityChangesListChanged) + container_registry.containerRemoved.connect(self._qualityChangesListChanged) + container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) + + def _qualityChangesListChanged(self, container: "ContainerInterface") -> None: + if container.getMetaDataEntry("type") == "quality_changes": + self._update() + def _update(self) -> None: Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) From 9ced5e92051cae2570510912d365d037d64554b6 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Sep 2019 14:38:27 +0200 Subject: [PATCH 502/994] Fix QObject segfaults in QML CURA-6599 --- cura/Machines/QualityChangesGroup.py | 8 ++++++++ cura/Machines/QualityGroup.py | 11 ++++++++++- cura/Settings/MachineManager.py | 13 +++++++++---- .../Custom/QualitiesWithIntentMenu.qml | 11 ++++++++++- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index cd88368e2a..2bd0c0ad70 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -15,6 +15,14 @@ class QualityChangesGroup(QObject): def __init__(self, name: str, quality_type: str, intent_category: str, parent: Optional["QObject"] = None) -> None: super().__init__(parent) + + # CURA-6599 + # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to + # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object + # parent to application seems to work. + from cura.CuraApplication import CuraApplication + self.setParent(CuraApplication.getInstance()) + self.name = name self.quality_type = quality_type self.intent_category = intent_category diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 951d3717de..60f307555f 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -26,8 +26,17 @@ from cura.Machines.ContainerNode import ContainerNode # class QualityGroup(QObject): - def __init__(self, name: str, quality_type: str, parent = None) -> None: + def __init__(self, name: str, quality_type: str, parent: Optional["QObject"] = None) -> None: super().__init__(parent) + + # CURA-6599 + # Same as QualityChangesGroup. + # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to + # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object + # parent to application seems to work. + from cura.CuraApplication import CuraApplication + self.setParent(CuraApplication.getInstance()) + self.name = name self.node_for_global = None # type: Optional[ContainerNode] self.nodes_for_extruders = {} # type: Dict[int, ContainerNode] diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index cb5b25c9ee..3aa2f68953 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1599,12 +1599,17 @@ class MachineManager(QObject): @pyqtProperty(QObject, fset = setQualityChangesGroup, notify = activeQualityChangesGroupChanged) def activeQualityChangesGroup(self) -> Optional["QualityChangesGroup"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if not global_stack or global_stack.qualityChanges == empty_quality_changes_container: + if global_stack is None or global_stack.qualityChanges == empty_quality_changes_container: return None - for group in ContainerTree.getInstance().getCurrentQualityChangesGroups(): # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. + + all_group_list = ContainerTree.getInstance().getCurrentQualityChangesGroups() + the_group = None + for group in all_group_list: # Match on the container ID of the global stack to find the quality changes group belonging to the active configuration. if group.metadata_for_global and group.metadata_for_global["id"] == global_stack.qualityChanges.getId(): - return group - return None + the_group = group + break + + return the_group @pyqtProperty(bool, notify = activeQualityChangesGroupChanged) def hasCustomQuality(self) -> bool: diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 5ebf653332..60fc8c55bf 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -172,7 +172,16 @@ Popup checkable: true visible: model.available text: model.name - checked: Cura.MachineManager.activeQualityChangesGroup.getName() == model.quality_changes_group.getName() + checked: + { + var active_quality_group = Cura.MachineManager.activeQualityChangesGroup + + if (active_quality_group != null) + { + return active_quality_group.getName() == model.quality_changes_group.getName() + } + return false + } ButtonGroup.group: buttonGroup } } From b72b542d2170a5df0f416971f50a6c8770b5d573 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 12:55:14 +0200 Subject: [PATCH 503/994] Add missing font & color CURA-6810 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 ++ resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 2 ++ .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 682aefa821..c45a5fa8d7 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -67,6 +67,8 @@ Item { id: textLabel text: intentSelection.text + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: intentSelection.verticalCenter diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index cebe130a20..acd8ed07bb 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -48,5 +48,7 @@ Button anchors.left: button.left anchors.leftMargin: UM.Theme.getSize("wide_margin").width renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 60fc8c55bf..332a56dd3b 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -111,7 +111,6 @@ Popup return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category; } ButtonGroup.group: buttonGroup - } } } @@ -271,6 +270,8 @@ Popup anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } Label { @@ -281,6 +282,8 @@ Popup anchors.rightMargin: UM.Theme.getSize("default_margin").width verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } } onClicked: From 785c33abeca8945d60eee86774aa1506fd9ee560 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 13:16:52 +0200 Subject: [PATCH 504/994] Change the action_button_hover color in dark theme This makes it actually visible. --- resources/themes/cura-dark/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index fc6c6612de..282004c3a9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -88,7 +88,7 @@ "action_button": [39, 44, 48, 255], "action_button_text": [255, 255, 255, 200], "action_button_border": [255, 255, 255, 30], - "action_button_hovered": [39, 44, 48, 255], + "action_button_hovered": [79, 85, 89, 255], "action_button_hovered_text": [255, 255, 255, 255], "action_button_hovered_border": [255, 255, 255, 30], "action_button_active": [39, 44, 48, 30], From b7b34eb6f723cbf1040c6972ba313d38c0e8d8f5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 13:39:16 +0200 Subject: [PATCH 505/994] Re-add the reset custom settings button to recommended panel CURA-6810 --- .../RecommendedQualityProfileSelector.qml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 68a3e4811d..3ca78d9fc5 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -52,6 +52,36 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth } + UM.SimpleButton + { + id: customisedSettings + + visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.MachineManager.hasCustomQuality + height: visible ? UM.Theme.getSize("print_setup_icon").height : 0 + width: height + anchors + { + right: profileLabel.right + rightMargin: UM.Theme.getSize("default_margin").width + leftMargin: UM.Theme.getSize("default_margin").width + verticalCenter: parent.verticalCenter + } + + color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") + iconSource: UM.Theme.getIcon("reset") + + onClicked: + { + // if the current profile is user-created, switch to a built-in quality + Cura.MachineManager.resetToUseDefaultQuality() + } + onEntered: + { + var tooltipContent = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.") + base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipContent) + } + onExited: base.hideTooltip() + } Cura.LabelBar { From eced1fe907068aeca1d591fec406026542e5fd50 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 14:02:11 +0200 Subject: [PATCH 506/994] Fix updating a profile with changed settings --- cura/Settings/ContainerManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 3154a88adf..af360ec235 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -280,7 +280,7 @@ class ContainerManager(QObject): current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") extruder_stacks = list(global_stack.extruders.values()) container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() - machine_definition_id = ContainerTree.getInstance().definitions[global_stack.definition.getId()].quality_definition + machine_definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition for stack in [global_stack] + extruder_stacks: # Find the quality_changes container for this stack and merge the contents of the top container into it. quality_changes = stack.qualityChanges From e452c640d4ff416298175930d21d719512493f96 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 26 Sep 2019 14:02:21 +0200 Subject: [PATCH 507/994] Set empty intent if quality is empty. ... instead of crashing. Not _really_ part of a ticket, but I'm solving this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807 --- cura/Settings/MachineManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3aa2f68953..531a08c0c8 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1561,6 +1561,9 @@ class MachineManager(QObject): variant_name = extruder.variant.getName() material_base_file = extruder.material.getMetaDataEntry("base_file") quality_id = extruder.quality.getId() + if quality_id == empty_quality_container.getId(): + extruder.intent = empty_intent_container + continue quality_node = container_tree.machines[definition_id].variants[variant_name].materials[material_base_file].qualities[quality_id] for intent_node in quality_node.intents.values(): From b19e7cd02769ef2fd03d256397777ec53cadea18 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 16:26:55 +0200 Subject: [PATCH 508/994] Add warning icon when not all extruders have same intent CURA-6601 --- cura/Settings/MachineManager.py | 18 ++++++++++ .../qml/PrintSetupSelector/NoIntentIcon.qml | 36 +++++++++++++++++++ .../RecommendedQualityProfileSelector.qml | 14 +++++++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 resources/qml/PrintSetupSelector/NoIntentIcon.qml diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3aa2f68953..94a65e8c55 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -627,6 +627,24 @@ class MachineManager(QObject): intent_category = category return intent_category + # Provies a list of extruder positions that have a different intent from the active one. + @pyqtProperty("QStringList", notify=activeIntentChanged) + def extruderPositionsWithNonActiveIntent(self): + global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + + if not global_container_stack: + return [] + + active_intent_category = self.activeIntentCategory + result = [] + for extruder in global_container_stack.extruderList: + category = extruder.intent.getMetaDataEntry("intent_category", "default") + if category != active_intent_category: + result.append(str(int(extruder.getMetaDataEntry("position")) + 1)) + + return result + + ## Returns whether there is anything unsupported in the current set-up. # # The current set-up signifies the global stack and all extruder stacks, diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml new file mode 100644 index 0000000000..7943a05ab4 --- /dev/null +++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml @@ -0,0 +1,36 @@ +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +Item +{ + id: icon + property var affected_extruders + property var intent_type: "" + + implicitWidth: UM.Theme.getSize("section_icon").width + implicitHeight: UM.Theme.getSize("section_icon").height + + UM.RecolorImage + { + source: UM.Theme.getIcon("info") + color: UM.Theme.getColor("icon") + anchors.fill: parent + } + MouseArea + { + anchors.fill: parent + hoverEnabled: parent.visible + onEntered: + { + var tooltipContent = catalog.i18ncp("@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')", "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead", "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead", affected_extruders.length).arg(intent_type).arg(affected_extruders) + base.showTooltip(icon.parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipContent) + } + onExited: base.hideTooltip() + } +} \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 3ca78d9fc5..99a1d25138 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -8,7 +8,7 @@ import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM import Cura 1.6 as Cura - +import ".." Item { id: qualityRow @@ -123,6 +123,18 @@ Item elide: Text.ElideRight } + NoIntentIcon + { + affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent + intent_type: model.name + anchors.right: intentCategoryLabel.right + anchors.rightMargin: UM.Theme.getSize("narrow_margin").width + width: intentCategoryLabel.height * 0.75 + anchors.verticalCenter: parent.verticalCenter + height: width + visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length + } + Cura.RadioCheckbar { anchors From e5d94fd2e41636170d21c59a4cc1eafd823eb80a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 26 Sep 2019 17:19:08 +0200 Subject: [PATCH 509/994] Change to "name" property CURA-6599 --- cura/Machines/QualityChangesGroup.py | 10 +++++----- .../Custom/QualitiesWithIntentMenu.qml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 2bd0c0ad70..0cb17f797a 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Optional -from PyQt5.QtCore import QObject, pyqtSlot +from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty ## Data struct to group several quality changes instance containers together. @@ -23,16 +23,16 @@ class QualityChangesGroup(QObject): from cura.CuraApplication import CuraApplication self.setParent(CuraApplication.getInstance()) - self.name = name + self._name = name self.quality_type = quality_type self.intent_category = intent_category self.is_available = False self.metadata_for_global = {} # type: Dict[str, Any] self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] - @pyqtSlot(result = str) - def getName(self) -> str: - return self.name + @pyqtProperty(str, constant = True) + def name(self) -> str: + return self._name def __str__(self) -> str: return "{class_name}[{name}, available = {is_available}]".format(class_name = self.__class__.__name__, name = self.name, is_available = self.is_available) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 332a56dd3b..c5a0df0bc5 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -177,7 +177,7 @@ Popup if (active_quality_group != null) { - return active_quality_group.getName() == model.quality_changes_group.getName() + return active_quality_group.name == model.quality_changes_group.name } return false } From 31434ebde8ec6c01b4456ba263481b330f8060f8 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 27 Sep 2019 11:51:50 +0200 Subject: [PATCH 510/994] Fix QML nullptr warnings. --- resources/qml/RadioCheckbar.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 59dba59910..4a85471095 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -97,10 +97,11 @@ Item Component { id: disabledComponent - Item + Rectangle { height: checkboxSize width: checkboxSize + color: "transparent" Rectangle { From 7a1850a87bb96b26e799cc9b90cfec70486cd459 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 27 Sep 2019 12:53:32 +0200 Subject: [PATCH 511/994] Actually fix QML nullptr warnings for real. --- .../UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml | 4 ++-- resources/qml/RadioCheckbar.qml | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml index b27416e199..ccdc74f2ad 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml @@ -294,8 +294,8 @@ Cura.MachineAction MessageDialog { id: invalidIPAddressMessageDialog - x: (parent.x + (parent.width) / 2) | 0 - y: (parent.y + (parent.height) / 2) | 0 + x: parent ? (parent.x + (parent.width) / 2) : 0 + y: parent ? (parent.y + (parent.height) / 2) : 0 title: catalog.i18nc("@title:window", "Invalid IP address") text: catalog.i18nc("@text", "Please enter a valid IP address.") icon: StandardIcon.Warning diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 4a85471095..727907254e 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -97,18 +97,17 @@ Item Component { id: disabledComponent - Rectangle + Item { height: checkboxSize width: checkboxSize - color: "transparent" Rectangle { // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator // but not when using the exact same QML in Cura. - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent ? parent.verticalCenter : undefined + anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined height: inactiveMarkerSize width: inactiveMarkerSize radius: Math.round(width / 2) From 97eaeab3bdeb057ecd3c817a0bc2afb1cc2e03b0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 27 Sep 2019 15:13:23 +0200 Subject: [PATCH 512/994] Fix missing intent in mock and missing quality_type These are used by the code. Otherwise there would be an AttributeError of 'intent' not existing, and the quality type in the quality node wouldn't match because it's a magic mock. --- tests/TestIntentManager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index a82de1273d..aeb21263a8 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -19,7 +19,7 @@ mocked_intent_metadata = [ mocked_qualitygroup_metadata = { "normal": QualityGroup("um3_aa4_pla_normal", "normal"), - "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type:Dict[str, QualityGroup] + "abnorm": QualityGroup("um3_aa4_pla_abnorm", "abnorm")} # type: Dict[str, QualityGroup] @pytest.fixture def mock_container_tree() -> MagicMock: @@ -33,6 +33,7 @@ def mock_container_tree() -> MagicMock: "generic_pla": MagicMock( qualities = { "um3_aa4_pla_normal": MagicMock( + quality_type = "normal", intents = { "smooth": MagicMock( intent_category = "smooth", @@ -41,6 +42,7 @@ def mock_container_tree() -> MagicMock: } ), "um3_aa4_pla_abnorm": MagicMock( + quality_type = "abnorm", intents = { "strong": MagicMock( intent_category = "strong", @@ -104,10 +106,12 @@ def doSetup(application, extruder_manager, container_registry, global_stack) -> extruder_stack_a.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_a.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_a.material = MockContainer({"base_file": "generic_pla"}) + extruder_stack_a.intent = MockContainer({"id": "empty_intent", "intent_category": "default"}) extruder_stack_b = MockContainer({"id": "Extruder II: Plastic Boogaloo"}) extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_b.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) + extruder_stack_b.intent = MockContainer({"id": "empty_intent", "intent_category": "default"}) global_stack.extruderList = [extruder_stack_a, extruder_stack_b] application.getGlobalContainerStack = MagicMock(return_value = global_stack) From f33937eb7b33afae835752b17f8f851e610bb7a0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 27 Sep 2019 15:25:41 +0200 Subject: [PATCH 513/994] Use extruderList instead of extruders The extruders attribute is deprecated. Found during testing and tooling. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 429dffcca2..dda5a5690a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1546,7 +1546,7 @@ class MachineManager(QObject): return # This is not changing the quality for the active machine !!!!!!!! global_stack.quality = quality_group.node_for_global.container - for extruder_nr, extruder_stack in global_stack.extruders.items(): + for extruder_nr, extruder_stack in enumerate(global_stack.extruderList): quality_container = empty_quality_container if extruder_nr in quality_group.nodes_for_extruders: container = quality_group.nodes_for_extruders[extruder_nr].container From 4e8929a07236bb05366a4c620427f7f30435d54f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 27 Sep 2019 15:26:14 +0200 Subject: [PATCH 514/994] Fix structure of mock container tree Found during testing and tooling. --- tests/TestIntentManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index aeb21263a8..17d102b5ef 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -35,7 +35,7 @@ def mock_container_tree() -> MagicMock: "um3_aa4_pla_normal": MagicMock( quality_type = "normal", intents = { - "smooth": MagicMock( + "um3_aa4_pla_smooth_normal": MagicMock( intent_category = "smooth", getMetadata = MagicMock(return_value = mocked_intent_metadata[0]) ) @@ -44,7 +44,7 @@ def mock_container_tree() -> MagicMock: "um3_aa4_pla_abnorm": MagicMock( quality_type = "abnorm", intents = { - "strong": MagicMock( + "um3_aa4_pla_strong_abnorm": MagicMock( intent_category = "strong", getMetadata = MagicMock(return_value = mocked_intent_metadata[1]) ) From 900761b37318bc0e1fd9ff752f7fc68d15e6cd83 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 27 Sep 2019 15:31:58 +0200 Subject: [PATCH 515/994] Fix documentation of quality node class It's a quality container, not a material container. This was a copy-paste mistake. Also added that this may be a global quality container, not always a per-extruder quality container. Found during testing & tooling. --- cura/Machines/QualityNode.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 8bb2870ceb..66919d1c07 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -12,7 +12,9 @@ if TYPE_CHECKING: from cura.Machines.MaterialNode import MaterialNode from cura.Machines.MachineNode import MachineNode -## Represents a material profile in the container tree. +## Represents a quality profile in the container tree. +# +# This may either be a normal quality profile or a global quality profile. # # Its subcontainers are intent profiles. class QualityNode(ContainerNode): From 45f3b6eeb2fab0867369bc1d6118b2e71959a260 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 27 Sep 2019 16:04:49 +0200 Subject: [PATCH 516/994] Simplify quality node intents list test Not a whole lot of mocking. I also added a lot of extra instance containers that should NOT match. Added during testing & tooling. --- tests/Machines/TestQualityNode.py | 107 +++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 31 deletions(-) diff --git a/tests/Machines/TestQualityNode.py b/tests/Machines/TestQualityNode.py index 54266cb6ad..ffe897d203 100644 --- a/tests/Machines/TestQualityNode.py +++ b/tests/Machines/TestQualityNode.py @@ -1,50 +1,95 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import patch, MagicMock import pytest from cura.Machines.QualityNode import QualityNode - -instance_container_metadata_dict = {"fdmprinter": {"variant_1": {"material_1": [{"id": "intent_1"}, {"id": "intent_2"}]}}, - "machine_1": {"variant_2": {"material_2": [{"id": "intent_3"}, {"id": "intent_4"}]}}} - -metadata_dict = {} - - -def getMetadataEntrySideEffect(*args, **kwargs): - return metadata_dict.get(args[0]) - - -def createMockedInstanceContainer(container_id): - result = MagicMock() - result.getId = MagicMock(return_value=container_id) - result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) - return result - - -def getInstanceContainerSideEffect(*args, **kwargs): - - definition_dict = instance_container_metadata_dict.get(kwargs["definition"]) - variant_dict = definition_dict.get(kwargs["variant"]) - return variant_dict.get(kwargs["material"]) +## Metadata for hypothetical containers that get put in the registry. +metadatas = [ + { + "id": "matching_intent", # Matches our query. + "type": "intent", + "definition": "correct_definition", + "variant": "correct_variant", + "material": "correct_material", + "quality_type": "correct_quality_type" + }, + { + "id": "matching_intent_2", # Matches our query as well. + "type": "intent", + "definition": "correct_definition", + "variant": "correct_variant", + "material": "correct_material", + "quality_type": "correct_quality_type" + }, + { + "id": "bad_type", + "type": "quality", # Doesn't match because it's not an intent. + "definition": "correct_definition", + "variant": "correct_variant", + "material": "correct_material", + "quality_type": "correct_quality_type" + }, + { + "id": "bad_definition", + "type": "intent", + "definition": "wrong_definition", # Doesn't match on the definition. + "variant": "correct_variant", + "material": "correct_material", + "quality_type": "correct_quality_type" + }, + { + "id": "bad_variant", + "type": "intent", + "definition": "correct_definition", + "variant": "wrong_variant", # Doesn't match on the variant. + "material": "correct_material", + "quality_type": "correct_quality_type" + }, + { + "id": "bad_material", + "type": "intent", + "definition": "correct_definition", + "variant": "correct_variant", + "material": "wrong_material", # Doesn't match on the material. + "quality_type": "correct_quality_type" + }, + { + "id": "bad_quality", + "type": "intent", + "definition": "correct_definition", + "variant": "correct_variant", + "material": "correct_material", + "quality_type": "wrong_quality_type" # Doesn't match on the quality type. + }, + { + "id": "quality_1", + "quality_type": "correct_quality_type", + "material": "correct_material" + } +] @pytest.fixture def container_registry(): result = MagicMock() - result.findInstanceContainersMetadata = MagicMock(side_effect=getInstanceContainerSideEffect) + def findContainersMetadata(**kwargs): + return [metadata for metadata in metadatas if kwargs.items() <= metadata.items()] + result.findContainersMetadata = findContainersMetadata + result.findInstanceContainersMetadata = findContainersMetadata return result - def test_qualityNode_machine_1(container_registry): material_node = MagicMock() - material_node.variant.machine.quality_definition = "machine_1" - material_node.variant.variant_name = "variant_2" - material_node.base_file = "material_2" + material_node.variant.machine.quality_definition = "correct_definition" + material_node.variant.variant_name = "correct_variant" with patch("cura.Machines.QualityNode.IntentNode"): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): node = QualityNode("quality_1", material_node) assert len(node.intents) == 3 - assert "intent_3" in node.intents - assert "intent_4" in node.intents + assert "matching_intent" in node.intents + assert "matching_intent_2" in node.intents assert "empty_intent" in node.intents \ No newline at end of file From 916bb5a32be2e321968411a042832c115396477f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 30 Sep 2019 12:55:10 +0200 Subject: [PATCH 517/994] Select correct intent when quality_changes has an intent category --- cura/Settings/MachineManager.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index dda5a5690a..85b6d48cf5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1316,6 +1316,13 @@ class MachineManager(QObject): if not extruder.isEnabled: continue current_category = extruder.intent.getMetaDataEntry("intent_category", "default") + if current_category != "default" and current_category != category: + category = current_category + continue + # It's also possible that the qualityChanges has an opinion about the intent_category. + # This is in the case that a QC was made on an intent, but none of the materials have that intent. + # If the user switches back, we do want the intent to be selected again. + current_category = extruder.qualityChanges.getMetaDataEntry("intent_category", "default") if current_category != "default" and current_category != category: category = current_category self.setIntentByCategory(category) From df105bc8229dcf017f5d2258fb81dbcdcadd8620 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 10:39:18 +0200 Subject: [PATCH 518/994] Fix update material due to compatible material diameter change CURA-6821 --- cura/Machines/MaterialNode.py | 4 +++- cura/Settings/MachineManager.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index f39ece4f8c..91b6601dc8 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -29,6 +29,7 @@ class MaterialNode(ContainerNode): self.base_file = my_metadata["base_file"] self.material_type = my_metadata["material"] self.guid = my_metadata["GUID"] + self.diameter = my_metadata["properties"]["diameter"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) container_registry.containerMetaDataChanged.connect(self._onMetadataChanged) @@ -129,7 +130,8 @@ class MaterialNode(ContainerNode): self.material_type = new_metadata["material"] old_guid = self.guid self.guid = new_metadata["GUID"] + self.diameter = new_metadata["properties"]["diameter"] if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. self.qualities = {} self._loadAll() # Re-load the quality profiles for this node. - self.materialChanged.emit(self) \ No newline at end of file + self.materialChanged.emit(self) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 85b6d48cf5..d5ea718d72 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1346,14 +1346,21 @@ class MachineManager(QObject): continue current_material_base_name = extruder.material.getMetaDataEntry("base_file") - current_nozzle_name = None - if extruder.variant.getId() != empty_variant_container.getId(): - current_nozzle_name = extruder.variant.getMetaDataEntry("name") + current_nozzle_name = extruder.variant.getMetaDataEntry("name") # If we can keep the current material after the switch, try to do so. nozzle_node = ContainerTree.getInstance().machines[self._global_container_stack.definition.getId()].variants[current_nozzle_name] candidate_materials = nozzle_node.materials - if current_material_base_name in candidate_materials: # The current material is also available after the switch. Retain it. + old_approximate_material_diameter = None # type: Optional[float] + if candidate_materials: + candidate_material = list(candidate_materials.values())[0] + old_approximate_material_diameter = int(round(float(candidate_material.diameter))) + new_approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) + + # Only switch to the old candidate material if the approximate material diameter of the extruder stays the + # same. + if new_approximate_material_diameter == old_approximate_material_diameter and \ + current_material_base_name in candidate_materials: # The current material is also available after the switch. Retain it. new_material = candidate_materials[current_material_base_name] self._setMaterial(position_item, new_material) else: From 961e1e0d7e62c2c3a23e5be516d9f3211af19520 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 10:55:38 +0200 Subject: [PATCH 519/994] Fix material node update for empty_material CURA-6821 --- cura/Machines/MaterialNode.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 91b6601dc8..7d71b24939 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Any, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry @@ -29,7 +29,10 @@ class MaterialNode(ContainerNode): self.base_file = my_metadata["base_file"] self.material_type = my_metadata["material"] self.guid = my_metadata["GUID"] - self.diameter = my_metadata["properties"]["diameter"] + # MaterialNode can represent an empty_material container, which has no diameter. + self.diameter = None # type: Optional[str] + if "properties" in my_metadata: + self.diameter = my_metadata["properties"]["diameter"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) container_registry.containerMetaDataChanged.connect(self._onMetadataChanged) @@ -130,7 +133,8 @@ class MaterialNode(ContainerNode): self.material_type = new_metadata["material"] old_guid = self.guid self.guid = new_metadata["GUID"] - self.diameter = new_metadata["properties"]["diameter"] + if "properties" in new_metadata: + self.diameter = new_metadata["properties"]["diameter"] if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. self.qualities = {} self._loadAll() # Re-load the quality profiles for this node. From bc524b2c149ea93c79b78a9178395a802a52f801 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 11:20:24 +0200 Subject: [PATCH 520/994] Fix unit test due to QualityGroup parent changes --- cura/Machines/MachineNode.py | 23 ++++++++++++++++++++--- cura/Machines/QualityChangesGroup.py | 10 +--------- cura/Machines/QualityGroup.py | 8 -------- cura/Machines/QualityManager.py | 8 +++++++- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 8b45540723..56965b32a4 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -7,12 +7,14 @@ from UM.Logger import Logger from UM.Signal import Signal from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. + from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityChangesGroup import QualityChangesGroup # To construct groups of quality changes profiles that belong together. from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode + ## This class represents a machine in the container tree. # # The subnodes of these nodes are variants. @@ -80,7 +82,15 @@ class MachineNode(ContainerNode): if not global_quality_node.container: Logger.log("w", "Node {0} doesn't have a container.".format(global_quality_node.container_id)) continue - quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + # CURA-6599 + # Same as QualityChangesGroup. + # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to + # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object + # parent to application seems to work. + from cura.CuraApplication import CuraApplication + quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), + quality_type = quality_type, + parent = CuraApplication.getInstance()) quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): if quality_type in qualities_per_type: @@ -123,7 +133,14 @@ class MachineNode(ContainerNode): for quality_changes in machine_quality_changes: name = quality_changes["name"] if name not in groups_by_name: - groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], intent_category = quality_changes.get("intent_category", "default")) + # CURA-6599 + # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to + # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object + # parent to application seems to work. + from cura.CuraApplication import CuraApplication + groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], + intent_category = quality_changes.get("intent_category", "default"), + parent = CuraApplication.getInstance()) elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") if "position" in quality_changes: # An extruder profile. @@ -147,7 +164,7 @@ class MachineNode(ContainerNode): # If the preferred global quality is not in there, an arbitrary global # quality is taken. # If there are no global qualities, an empty quality is returned. - def preferredGlobalQuality(self) -> QualityNode: + def preferredGlobalQuality(self) -> "QualityNode": return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) ## (Re)loads all variants under this printer. diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 0cb17f797a..4fb9706a0a 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Optional -from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty +from PyQt5.QtCore import QObject, pyqtProperty ## Data struct to group several quality changes instance containers together. @@ -15,14 +15,6 @@ class QualityChangesGroup(QObject): def __init__(self, name: str, quality_type: str, intent_category: str, parent: Optional["QObject"] = None) -> None: super().__init__(parent) - - # CURA-6599 - # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to - # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object - # parent to application seems to work. - from cura.CuraApplication import CuraApplication - self.setParent(CuraApplication.getInstance()) - self._name = name self.quality_type = quality_type self.intent_category = intent_category diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 60f307555f..1ea7ef6903 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -29,14 +29,6 @@ class QualityGroup(QObject): def __init__(self, name: str, quality_type: str, parent: Optional["QObject"] = None) -> None: super().__init__(parent) - # CURA-6599 - # Same as QualityChangesGroup. - # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to - # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object - # parent to application seems to work. - from cura.CuraApplication import CuraApplication - self.setParent(CuraApplication.getInstance()) - self.name = name self.node_for_global = None # type: Optional[ContainerNode] self.nodes_for_extruders = {} # type: Dict[int, ContainerNode] diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 4aa88d6775..bf1ecc66a6 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -111,7 +111,13 @@ class QualityManager(QObject): quality_group_dict = dict() for node in nodes_to_check: if node and node.quality_type: - quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type) + # CURA-6599 + # Same as QualityChangesGroup. + # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to + # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object + # parent to application seems to work. + quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type, + parent = CuraApplication.getInstance()) quality_group.setGlobalNode(node) quality_group_dict[node.quality_type] = quality_group From f867f3485efe60a667fa7e480e1f128c40356e13 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 11:30:54 +0200 Subject: [PATCH 521/994] Fix TestIntentManager --- tests/TestIntentManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/TestIntentManager.py b/tests/TestIntentManager.py index 17d102b5ef..66e3085337 100644 --- a/tests/TestIntentManager.py +++ b/tests/TestIntentManager.py @@ -107,11 +107,13 @@ def doSetup(application, extruder_manager, container_registry, global_stack) -> extruder_stack_a.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_a.material = MockContainer({"base_file": "generic_pla"}) extruder_stack_a.intent = MockContainer({"id": "empty_intent", "intent_category": "default"}) + extruder_stack_a.qualityChanges = MockContainer({"id": "empty_quality_changes", "intent_category": "default"}) extruder_stack_b = MockContainer({"id": "Extruder II: Plastic Boogaloo"}) extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_b.quality = MockContainer({"id": "um3_aa4_pla_normal"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) extruder_stack_b.intent = MockContainer({"id": "empty_intent", "intent_category": "default"}) + extruder_stack_b.qualityChanges = MockContainer({"id": "empty_quality_changes", "intent_category": "default"}) global_stack.extruderList = [extruder_stack_a, extruder_stack_b] application.getGlobalContainerStack = MagicMock(return_value = global_stack) From 55a5464ed3d5805ca1764f60ba41d45540545136 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 11:41:17 +0200 Subject: [PATCH 522/994] Fix missing import --- cura/Machines/QualityManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index bf1ecc66a6..113253f822 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -116,6 +116,7 @@ class QualityManager(QObject): # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object # parent to application seems to work. + from cura.CuraApplication import CuraApplication quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type, parent = CuraApplication.getInstance()) quality_group.setGlobalNode(node) From 51c96aecde006a2d3caf4b3098c902839f02aaff Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 11:43:34 +0200 Subject: [PATCH 523/994] Fix for-loop in updateMaterialWithVariant CURA-6821 --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d5ea718d72..6dc371b45f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1355,7 +1355,7 @@ class MachineManager(QObject): if candidate_materials: candidate_material = list(candidate_materials.values())[0] old_approximate_material_diameter = int(round(float(candidate_material.diameter))) - new_approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) + new_approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) # Only switch to the old candidate material if the approximate material diameter of the extruder stays the # same. @@ -1366,7 +1366,7 @@ class MachineManager(QObject): else: # The current material is not available, find the preferred one. if position is not None: - approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) + approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) material_node = nozzle_node.preferredMaterial(approximate_material_diameter) self._setMaterial(position_item, material_node) From aaca4bb9a1512f49437979452c3bd3dc9db584aa Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 11:58:52 +0200 Subject: [PATCH 524/994] Fix KeyError in root material ID check CURA-6827 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 6dc371b45f..5f4a5a2f9c 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1246,7 +1246,7 @@ class MachineManager(QObject): self._global_container_stack.extruderList[int(position)].material = empty_material_container root_material_id = None # The _current_root_material_id is used in the MaterialMenu to see which material is selected - if root_material_id != self._current_root_material_id[position]: + if position not in self._current_root_material_id or root_material_id != self._current_root_material_id[position]: self._current_root_material_id[position] = root_material_id self.rootMaterialChanged.emit() From ad7b58e460c83e049166db83cc9d9e8110529603 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 15:05:32 +0200 Subject: [PATCH 525/994] Get diameter from material container CURA-6821 --- cura/Machines/MaterialNode.py | 8 +------- cura/Settings/MachineManager.py | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 7d71b24939..2ea0cd12b5 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -18,7 +18,7 @@ if TYPE_CHECKING: # # Its subcontainers are quality profiles. class MaterialNode(ContainerNode): - def __init__(self, container_id, variant: "VariantNode") -> None: + def __init__(self, container_id: str, variant: "VariantNode") -> None: super().__init__(container_id) self.variant = variant self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. @@ -29,10 +29,6 @@ class MaterialNode(ContainerNode): self.base_file = my_metadata["base_file"] self.material_type = my_metadata["material"] self.guid = my_metadata["GUID"] - # MaterialNode can represent an empty_material container, which has no diameter. - self.diameter = None # type: Optional[str] - if "properties" in my_metadata: - self.diameter = my_metadata["properties"]["diameter"] self._loadAll() container_registry.containerRemoved.connect(self._onRemoved) container_registry.containerMetaDataChanged.connect(self._onMetadataChanged) @@ -133,8 +129,6 @@ class MaterialNode(ContainerNode): self.material_type = new_metadata["material"] old_guid = self.guid self.guid = new_metadata["GUID"] - if "properties" in new_metadata: - self.diameter = new_metadata["properties"]["diameter"] if self.base_file != old_base_file or self.material_type != old_material_type or self.guid != old_guid: # List of quality profiles could've changed. self.qualities = {} self._loadAll() # Re-load the quality profiles for this node. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5f4a5a2f9c..ce8ea8b85e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1354,7 +1354,8 @@ class MachineManager(QObject): old_approximate_material_diameter = None # type: Optional[float] if candidate_materials: candidate_material = list(candidate_materials.values())[0] - old_approximate_material_diameter = int(round(float(candidate_material.diameter))) + default_material_diameter = "2.85" + old_approximate_material_diameter = int(round(float(candidate_material.container.getMetaDataEntry("properties/diameter", default_material_diameter)))) new_approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) # Only switch to the old candidate material if the approximate material diameter of the extruder stays the From c030328b7f07c993efa9d3b54581c901e363e4f4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 15:20:58 +0200 Subject: [PATCH 526/994] Fix intent profile selection CURA-6810 --- cura/Settings/CuraContainerStack.py | 4 ++-- cura/Settings/MachineManager.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index c141ac9b0e..1455e140a8 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -91,12 +91,12 @@ class CuraContainerStack(ContainerStack): # # \param new_intent The new intent container. It is expected to have a "type" metadata entry with the value "intent". def setIntent(self, new_intent: InstanceContainer, postpone_emit: bool = False) -> None: - self.replaceContainer(_ContainerIndexes.Intent, new_intent, postpone_emit=postpone_emit) + self.replaceContainer(_ContainerIndexes.Intent, new_intent, postpone_emit = postpone_emit) ## Get the quality container. # # \return The intent container. Should always be a valid container, but can be equal to the empty InstanceContainer. - @pyqtProperty(InstanceContainer, fset=setIntent, notify=pyqtContainersChanged) + @pyqtProperty(InstanceContainer, fset = setIntent, notify = pyqtContainersChanged) def intent(self) -> InstanceContainer: return cast(InstanceContainer, self._containers[_ContainerIndexes.Intent]) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ce8ea8b85e..95faf27269 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1322,6 +1322,10 @@ class MachineManager(QObject): # It's also possible that the qualityChanges has an opinion about the intent_category. # This is in the case that a QC was made on an intent, but none of the materials have that intent. # If the user switches back, we do want the intent to be selected again. + # + # Do not ask empty quality changes for intent category. + if extruder.qualityChanges.getId() == empty_quality_changes_container.getId(): + continue current_category = extruder.qualityChanges.getMetaDataEntry("intent_category", "default") if current_category != "default" and current_category != category: category = current_category From 296f8af59cbef5121a016c6917e0a5da1b55c98f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Oct 2019 16:15:33 +0200 Subject: [PATCH 527/994] Always clear ListModel so layer height selector will align properly CURA-6836 --- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 8b3999275d..ab40f440ec 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -63,6 +63,13 @@ class QualityProfilesDropDownMenuModel(ListModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) + # CURA-6836 + # LabelBar is a repeater that creates labels for quality layer heights. Because of an optimization in + # UM.ListModel, the model will not remove all items and recreate new ones every time there's an update. + # Because LabelBar uses Repeater with Labels anchoring to "undefined" in certain cases, the anchoring will be + # kept the same as before. + self.setItems([]) + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: self.setItems([]) From a1d90c17da0cbeab742e76f6d29cc2ef9fc7e13d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 1 Oct 2019 16:46:11 +0200 Subject: [PATCH 528/994] Fix synchronize configurations (intent branch). - Approximate diameter needed to be a string. - GUID-tag is mostly in capitals. - Workaround for an overload of 'get' not being called (default parameter didn't work somehow?). part of CURA-6817 --- cura/Settings/MachineManager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ce8ea8b85e..5264684857 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1450,11 +1450,14 @@ class MachineManager(QObject): # Find the material profile that the printer has stored. # This might find one of the duplicates if the user duplicated the material to sync with. But that's okay; both have this GUID so both are correct. approximate_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter()) - materials_with_guid = container_registry.findInstanceContainersMetadata(guid = extruder_configuration.material.guid, approximate_diameter = approximate_diameter) + materials_with_guid = container_registry.findInstanceContainersMetadata(GUID = extruder_configuration.material.guid, approximate_diameter = str(approximate_diameter), ignore_case = True) material_container_node = variant_node.preferredMaterial(approximate_diameter) if materials_with_guid: # We also have the material profile that the printer wants to share. base_file = materials_with_guid[0]["base_file"] - material_container_node = variant_node.materials.get(base_file, default = material_container_node) # If Cura thinks that the selected material is not available for this printer, revert to the preferred material. + keep_ref = material_container_node # WORKAROUND: Somehow 'default = ...' doesn't work for the following get, so it's now done in this cumbersome way. + material_container_node = variant_node.materials.get(base_file) + if not material_container_node: # If Cura thinks that the selected material is not available for this printer, revert to the preferred material. + material_container_node = keep_ref self._setMaterial(position, material_container_node) self._global_container_stack.extruders[position].setEnabled(True) From be33a9aa7e9f9e6e971155b4df8202856b756463 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 2 Oct 2019 08:41:02 +0200 Subject: [PATCH 529/994] Fix updating current root material IDs CURA-6821 --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 95faf27269..3827f05b88 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -260,6 +260,8 @@ class MachineManager(QObject): extruder_stack.propertyChanged.connect(self._onPropertyChanged) extruder_stack.containersChanged.connect(self._onContainersChanged) + self._onRootMaterialChanged() + self.activeQualityGroupChanged.emit() def _onActiveExtruderStackChanged(self) -> None: From 89c35cd03c39480f04023e60f7b22f44daad781e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 2 Oct 2019 08:52:58 +0200 Subject: [PATCH 530/994] Simplify code CURA-6817 --- cura/Settings/MachineManager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5264684857..54a5a8def2 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1454,10 +1454,7 @@ class MachineManager(QObject): material_container_node = variant_node.preferredMaterial(approximate_diameter) if materials_with_guid: # We also have the material profile that the printer wants to share. base_file = materials_with_guid[0]["base_file"] - keep_ref = material_container_node # WORKAROUND: Somehow 'default = ...' doesn't work for the following get, so it's now done in this cumbersome way. - material_container_node = variant_node.materials.get(base_file) - if not material_container_node: # If Cura thinks that the selected material is not available for this printer, revert to the preferred material. - material_container_node = keep_ref + material_container_node = variant_node.materials.get(base_file, material_container_node) self._setMaterial(position, material_container_node) self._global_container_stack.extruders[position].setEnabled(True) From b245be69707b2441420690577bfab397f2e82408 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 1 Oct 2019 15:53:34 +0200 Subject: [PATCH 531/994] Remove has_machine_materials metadata It's not behaving as expected here. For instance, Ultimaker 3 wasn't specifying has_machine_materials and thus only the base materials would get loaded, but clearly the Ultimaker 3 has materials specialised for it. Whether or not a printer has materials specialised for it is now determined by whether the specialisations exist in the material files. So we don't need the metadata entry any more. It seemed to have not been in use anyway, except by one printer which specified that has_machine_materials is true. I've now made it behave as if it's always true. Contributes to issue CURA-6831. --- cura/Machines/MachineNode.py | 1 - cura/Machines/VariantNode.py | 9 ++------- resources/definitions/hms434.def.json | 1 - tests/Machines/TestMachineNode.py | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 56965b32a4..d136151f44 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -36,7 +36,6 @@ class MachineNode(ContainerNode): # Otherwise you need to keep it up-to-date during runtime. self.has_materials = parseBool(my_metadata.get("has_materials", "true")) self.has_variants = parseBool(my_metadata.get("has_variants", "false")) - self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) self.quality_definition = my_metadata.get("quality_definition", container_id) if self.has_machine_quality else "fdmprinter" self.exclude_materials = my_metadata.get("exclude_materials", []) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 2680c6d28b..ff88098a00 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -46,13 +46,11 @@ class VariantNode(ContainerNode): return # There should not be any materials loaded for this printer. # Find all the materials for this variant's name. - if not self.machine.has_machine_materials: # Printer has no specific materials. Look for all fdmprinter materials. - materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") # These are ONLY the base materials. else: # Printer has its own material profiles. Look for material profiles with this printer's definition. - all_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") + base_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id) variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant = self.variant_name) # If empty_variant, this won't return anything. - materials_per_base_file = {material["base_file"]: material for material in all_materials} + materials_per_base_file = {material["base_file"]: material for material in base_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. materials = list(materials_per_base_file.values()) @@ -100,9 +98,6 @@ class VariantNode(ContainerNode): if not self.machine.has_materials: return # We won't add any materials. material_definition = container.getMetaDataEntry("definition") - if not self.machine.has_machine_materials: - if material_definition != "fdmprinter": - return base_file = container.getMetaDataEntry("base_file") if base_file in self.machine.exclude_materials: diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 1901f87824..ca031f26bf 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -9,7 +9,6 @@ "file_formats": "text/x-gcode", "has_materials": true, - "has_machine_materials": true, "preferred_material": "generic_pla", "exclude_materials": [ "chromatik_pla", diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index d2ab108251..4582f4c87d 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -7,7 +7,6 @@ from cura.Machines.MachineNode import MachineNode metadata_dict = { "has_materials": "false", "has_variants": "true", - "has_machine_materials": "true", "has_machine_quality": "true", "quality_definition": "test_quality_definition", "exclude_materials": ["excluded_material_1", "excluded_material_2"], From c8be1723432e1c6d3f310ed7273f36d660963467 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 1 Oct 2019 16:58:44 +0200 Subject: [PATCH 532/994] Add debugging functionality to visualise the container tree Could be useful for later, don't you think? Contributes to issue CURA-6831. --- cura/Machines/ContainerTree.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index b5d91ca8c1..ce4c43e1d3 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -108,3 +108,19 @@ class ContainerTree: if not isinstance(container_stack, GlobalStack): return # Not our concern. self.addMachineNodeByDefinitionId(container_stack.definition.getId()) + + ## For debugging purposes, visualise the entire container tree as it stands + # now. + def _visualise_tree(self) -> str: + lines = ["% CONTAINER TREE"] # Start with array and then combine into string, for performance. + for machine in self.machines.values(): + lines.append(" # " + machine.container_id) + for variant in machine.variants.values(): + lines.append(" * " + variant.container_id) + for material in variant.materials.values(): + lines.append(" + " + material.container_id) + for quality in material.qualities.values(): + lines.append(" - " + quality.container_id) + for intent in quality.intents.values(): + lines.append(" . " + intent.container_id) + return "\n".join(lines) \ No newline at end of file From 0b610ccd58b48d81c99ca8fc531b4a4149d35913 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 1 Oct 2019 17:24:20 +0200 Subject: [PATCH 533/994] Fix getting correct metadata entry for variant name Turns out that the material profiles deserialise the variant to the 'variant_name' metadata entry, not just 'variant'. This caused it to find no variant-specific material profiles at all anywhere. It would always fall back to the machine-specific names. Contributes to issue CURA-6831. --- cura/Machines/VariantNode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index ff88098a00..2e31399397 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -49,7 +49,7 @@ class VariantNode(ContainerNode): else: # Printer has its own material profiles. Look for material profiles with this printer's definition. base_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id) - variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant = self.variant_name) # If empty_variant, this won't return anything. + variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant_name = self.variant_name) # If empty_variant, this won't return anything. materials_per_base_file = {material["base_file"]: material for material in base_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. materials_per_base_file.update({material["base_file"]: material for material in variant_specific_materials}) # Variant-specific profiles override all of those. @@ -105,7 +105,7 @@ class VariantNode(ContainerNode): if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. if material_definition != "fdmprinter" and material_definition != self.machine.container_id: return - material_variant = container.getMetaDataEntry("variant", "empty") + material_variant = container.getMetaDataEntry("variant_name", "empty") if material_variant != "empty" and material_variant != self.variant_name: return else: # We already have this base profile. Replace the base profile if the new one is more specific. @@ -115,8 +115,8 @@ class VariantNode(ContainerNode): if new_definition != self.machine.container_id: return # Doesn't match this set-up. original_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.materials[base_file].container_id)[0] - original_variant = original_metadata.get("variant", "empty") - if original_variant != "empty" or container.getMetaDataEntry("variant", "empty") == "empty": + original_variant = original_metadata.get("variant_name", "empty") + if original_variant != "empty" or container.getMetaDataEntry("variant_name", "empty") == "empty": return # Original was already specific or just as unspecific as the new one. if "empty_material" in self.materials: @@ -145,7 +145,7 @@ class VariantNode(ContainerNode): if submaterial["definition"] == self.machine.container_id: if most_specific_submaterial["definition"] == "fdmprinter": most_specific_submaterial = submaterial - if most_specific_submaterial.get("variant", "empty") == "empty" and submaterial.get("variant", "empty") == self.variant_name: + if most_specific_submaterial.get("variant_name", "empty") == "empty" and submaterial.get("variant_name", "empty") == self.variant_name: most_specific_submaterial = submaterial self.materials[base_file] = MaterialNode(most_specific_submaterial["id"], variant = self) self.materialsChanged.emit(self.materials[base_file]) From 649ca99fe0561521ac081d162432436bd949d1f6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 1 Oct 2019 17:28:06 +0200 Subject: [PATCH 534/994] Only match on printer-specific materials, not variant-specific too If a submaterial doesn't exist for the current variant node but it does exist for a different variant node, then it would not be found in the variant-specific materials and then would be looked up in the printer-specific materials. It then depends on the order in which findInstanceContainersMetadata returns things for whether the actual printer-specific material is selected or a different variant-specific material is selected. No longer now, because the variant name is specified to be absent so it may not match on variant-specific profiles any more. Maybe this even gives us a small performance gain when combining these dictionaries, since there are now like 80% fewer profiles in that query. Contributes to issue CURA-6831. --- cura/Machines/VariantNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 2e31399397..c8593f9eba 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -48,7 +48,7 @@ class VariantNode(ContainerNode): # Find all the materials for this variant's name. else: # Printer has its own material profiles. Look for material profiles with this printer's definition. base_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = "fdmprinter") - printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id) + printer_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant_name = None) variant_specific_materials = container_registry.findInstanceContainersMetadata(type = "material", definition = self.machine.container_id, variant_name = self.variant_name) # If empty_variant, this won't return anything. materials_per_base_file = {material["base_file"]: material for material in base_materials} materials_per_base_file.update({material["base_file"]: material for material in printer_specific_materials}) # Printer-specific profiles override global ones. From 784396424c289a7a8bf65c67b30932722409d7f4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 2 Oct 2019 15:46:01 +0200 Subject: [PATCH 535/994] Get old diameter from old material instead of new candidate. part of CURA-6821 --- cura/Settings/MachineManager.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index f822ec2ab8..0cd70970c8 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1357,11 +1357,7 @@ class MachineManager(QObject): # If we can keep the current material after the switch, try to do so. nozzle_node = ContainerTree.getInstance().machines[self._global_container_stack.definition.getId()].variants[current_nozzle_name] candidate_materials = nozzle_node.materials - old_approximate_material_diameter = None # type: Optional[float] - if candidate_materials: - candidate_material = list(candidate_materials.values())[0] - default_material_diameter = "2.85" - old_approximate_material_diameter = int(round(float(candidate_material.container.getMetaDataEntry("properties/diameter", default_material_diameter)))) + old_approximate_material_diameter = int(extruder.material.getMetaDataEntry("approximate_diameter", default = 3)) new_approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) # Only switch to the old candidate material if the approximate material diameter of the extruder stays the From c6850b4f73789dfee1eedeb0ad8d84f1ca946997 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Oct 2019 16:39:50 +0200 Subject: [PATCH 536/994] Set right text color if menubutton is disbled CURA-6848 --- resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index acd8ed07bb..ffa6a68c9d 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -49,6 +49,6 @@ Button anchors.leftMargin: UM.Theme.getSize("wide_margin").width renderType: Text.NativeRendering font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") + color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive") } } \ No newline at end of file From ff3837bac5d4379ddada37eabaf7f98d9c4d1cbc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Oct 2019 16:48:57 +0200 Subject: [PATCH 537/994] Only show "Custom Profile" header if there are custom profiles CURA-6844 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index c5a0df0bc5..efaa0f1dd0 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -134,7 +134,7 @@ Popup renderType: Text.NativeRendering height: visible ? contentHeight: 0 enabled: false - visible: profilesList.visibleChildren.length > 0 + visible: profilesList.visibleChildren.length > 1 anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width } @@ -156,7 +156,7 @@ Popup target: parent property: "height" value: parent.childrenRect.height - when: parent.visibleChildren.length > 0 + when: parent.visibleChildren.length > 1 } //Add all the custom profiles. From 8beeac7fca275a723e0846ff446a80f76ff8c393 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Oct 2019 16:57:04 +0200 Subject: [PATCH 538/994] Make the radio button in the checkbar look consistent. The drake meme and CURA-6845 told me that it should look like that. --- resources/qml/RadioCheckbar.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 727907254e..0ce84ad8ca 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -140,7 +140,6 @@ Item { anchors { - margins: 3 fill: parent } radius: Math.round(width / 2) From fba7a6ff33519abb5b12b1532615d42eeca880b1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Oct 2019 17:01:21 +0200 Subject: [PATCH 539/994] Fix importing profiles CURA-6847 --- plugins/CuraProfileReader/CuraProfileReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index fa8ca89442..d4e5d393b2 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -97,7 +97,7 @@ class CuraProfileReader(ProfileReader): if global_stack is None: return None - active_quality_definition = ContainerTree.getInstance().machines[global_stack.definition.container_id].quality_definition + active_quality_definition = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition if profile.getMetaDataEntry("definition") != active_quality_definition: profile.setMetaDataEntry("definition", active_quality_definition) return profile From a93fd982ddf9b786db5d4627d73c6adea0c21669 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 2 Oct 2019 15:21:38 +0200 Subject: [PATCH 540/994] Fix renaming custom profile CURA-6842 --- cura/Machines/MachineNode.py | 1 + cura/Machines/Models/QualityManagementModel.py | 16 ++++++++++++++-- cura/Machines/QualityChangesGroup.py | 11 +++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index d136151f44..83e8b053fc 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -142,6 +142,7 @@ class MachineNode(ContainerNode): parent = CuraApplication.getInstance()) elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") + if "position" in quality_changes: # An extruder profile. groups_by_name[name].metadata_per_extruder[int(quality_changes["position"])] = quality_changes else: # Global profile. diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 6789059cba..dcaa43283c 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -87,11 +87,23 @@ class QualityManagementModel(ListModel): application = cura.CuraApplication.CuraApplication.getInstance() container_registry = application.getContainerRegistry() new_name = container_registry.uniqueName(new_name) - global_container = cast(InstanceContainer, container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"])[0]) - global_container.setName(new_name) + # CURA-6842 + # FIXME: setName() will trigger metaDataChanged signal that are connected with type Qt.AutoConnection. In this + # case, setName() will trigger direct connections which in turn causes the quality changes group and the models + # to update. Because multiple containers need to be renamed, and every time a container gets renamed, updates + # gets triggered and this results in partial updates. For example, if we rename the global quality changes + # container first, the rest of the system still thinks that I have selected "my_profile" instead of + # "my_new_profile", but an update already gets triggered, and the quality changes group that's selected will + # have no container for the global stack, because "my_profile" just got renamed to "my_new_profile". This results + # in crashes because the rest of the system assumes that all data in a QualityChangesGroup will be correct. + # + # Renaming the container for the global stack in the end seems to be ok, because the assumption is mostly based + # on the quality changes container for the global stack. for metadata in quality_changes_group.metadata_per_extruder.values(): extruder_container = cast(InstanceContainer, container_registry.findContainers(id = metadata["id"])[0]) extruder_container.setName(new_name) + global_container = cast(InstanceContainer, container_registry.findContainers(id=quality_changes_group.metadata_for_global["id"])[0]) + global_container.setName(new_name) quality_changes_group.name = new_name diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 4fb9706a0a..655060070b 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Optional -from PyQt5.QtCore import QObject, pyqtProperty +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal ## Data struct to group several quality changes instance containers together. @@ -22,7 +22,14 @@ class QualityChangesGroup(QObject): self.metadata_for_global = {} # type: Dict[str, Any] self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] - @pyqtProperty(str, constant = True) + nameChanged = pyqtSignal() + + def setName(self, name: str) -> None: + if self._name != name: + self._name = name + self.nameChanged.emit() + + @pyqtProperty(str, fset = setName, notify = nameChanged) def name(self) -> str: return self._name From 1def289bb9555a52c1c2fe5da5d20c635b8b46de Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 3 Oct 2019 09:51:45 +0200 Subject: [PATCH 541/994] Fix crash when importing profile that has different quality_definition CURA-6847 --- cura/Settings/CuraContainerRegistry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 84b714fdcf..557246ab1b 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -238,7 +238,7 @@ class CuraContainerRegistry(ContainerRegistry): # Get the expected machine definition. # i.e.: We expect gcode for a UM2 Extended to be defined as normal UM2 gcode... - profile_definition = container_tree.machines[machine_definition.getId()].quality_definition + profile_definition = machine_definition.getMetaDataEntry("quality_definition", "") expected_machine_definition = container_tree.machines[global_stack.definition.getId()].quality_definition # And check if the profile_definition matches either one (showing error if not): From 3f9f465053fa970ecf2da9e3ae228b37fdf3c40b Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Thu, 3 Oct 2019 12:03:48 +0200 Subject: [PATCH 542/994] Update strateo3d.def.json --- resources/definitions/strateo3d.def.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 38f7c4b0d3..b4b9f224ab 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -31,13 +31,14 @@ "machine_depth": { "default_value": 420 }, "machine_height": { "default_value": 495 }, "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, "gantry_height": { "default_value": 40 }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, - "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 E-1 F1500 \nG0 z1 \nG90 \nG28 \nM801.2 \nM801.0 \nM84" }, + "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, "machine_heat_zone_length": { "default_value": 7 }, @@ -47,17 +48,17 @@ "material_bed_temperature": { "maximum_value": "130" }, "material_bed_temperature_layer_0": { "maximum_value": "130" }, "extruder_prime_pos_abs": { "default_value": true }, - "machine_acceleration": { "default_value": 2000 }, + "machine_acceleration": { "default_value": 1500 }, "acceleration_enabled": { "value": false }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, - "acceleration_print": { "value": "2000" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1500 / 1500)" }, + "acceleration_print": { "value": "1500" }, "acceleration_support": { "value": "acceleration_print" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 2000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1500)" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1500)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 1500)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / 1500)" }, "adaptive_layer_height_variation": { "default_value": 0.1 }, "adaptive_layer_height_variation_step": { "default_value": 0.05 }, "adhesion_type": { "default_value": "skirt" }, From f1ecb63c3f08bcd90bd292a6eeeebfd6b1470097 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Thu, 3 Oct 2019 12:11:20 +0200 Subject: [PATCH 543/994] Setting version update --- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_A.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_B.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_C.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_D.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_E.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_F.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_G.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_H.inst.cfg | 2 +- resources/variants/strateo3d_standard_04.inst.cfg | 2 +- resources/variants/strateo3d_standard_06.inst.cfg | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index ed6eefaffe..bfb18a444c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 5501c91687..0cef5ae255 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index f60244024a..08ee21c497 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index 905a8dd7d8..4a74ad71eb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index d718ca9b76..ea6db301d7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index dac95a12ea..6c6dad3992 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index a490d8c582..a0546f6d8e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index 690463fd32..2cfc241aa7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index c701cb0143..50cfb4c11e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 79e82bf40f..8fb7ba8ed5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index d688415c7c..28ad37478e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 777e693156..544ba3b0bf 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index 22ea5bbb6e..f86140b415 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index b67c5a7092..3036cbc215 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index f146d02305..dd2a2f0c94 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index de0783bd9d..39fb0ba390 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index e8a542f84e..3a6babd860 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index 5820928910..bd418bccd6 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 32e6caf4b8..896c44ea06 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 00bc5e1468..7c8aa8553a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index 992d6bf539..e1fc3c9935 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index ec1cae9ddb..2f0b6ade1e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 3e38e488f0..f6ba60245c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 496dbbd7f3..534de977fe 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index f79f8b19e0..698feba6d5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index 13d0bb8bf3..c3a1ff764a 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index a207ab0438..3f2c6a8617 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index e38975a85e..faf731cabd 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index 75282edd6e..6229c8a8c0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index 9a36e8e390..ad25d6a6b3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 8a6c2bd566..48fc342581 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 8380b66240..8ec601e30f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index 9323ee2933..6a4c1bfecc 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index 94a7e3eb72..676cffd1f1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index e1858b3343..1caddc5543 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index d7cc60868b..f4b98ed47c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index 5214dab77e..ffe642001e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index e565aa053f..ecdcfa2b49 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index 5306f1bc8f..6d719613f1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index 7986e8f289..a30598c298 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 38b5e25b24..95fc12cacb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index bae7932184..190d73029a 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index a782e3f1a6..53d2e8b1da 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index ae35f6c605..b80711fe8d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index 22ba7f1c92..69db96ff85 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index 489a1c369e..a0a90933e2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index 0ace94666d..a8b7219a3a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 627bf8e94d..7a949c7fe5 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 5b1c21787b..003e0660c8 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 46cc77abc7..957f20205b 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 660f6e9039..817384f951 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index d33718b6b7..4551376434 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index b7827fe783..929227857d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index b589f1a405..53621b3e93 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 38875405b9..0cfc4081c2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 604a3ffd96..80e9934540 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index 781edd7385..c597412185 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index 7c5508bf51..def6799406 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index 65e29556f3..569188ff3c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index 42a49fb9c1..b83b16b3ff 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 90bbf7cd51..368cbf59f0 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg index 8ba4dbff9c..0fe2705fbd 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -4,7 +4,7 @@ name = H definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = h weight = -1 diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index 5c39d27c4b..36765ea8cf 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = a weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index 7d5c69e18b..afb61bb3b3 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index 8a1b0cf374..a0db1a5af4 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index 73379db500..3d52f5d331 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -4,7 +4,7 @@ name = Medium Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index f0378ac2a0..d3ce741a0d 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = e weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index 22ee65b9ab..842e579f73 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = f weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index e2c430d178..a5dcd8c000 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = g weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index 8bef923923..273ab89ba9 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse Quality definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = h weight = 0 diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg index 86db486d3b..ee249049d8 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg index 6f50af1e6c..5458f1f7cb 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle From 2d59271a6936654e7cc88ad7406bcad637c6e524 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 12:26:18 +0200 Subject: [PATCH 544/994] Remove hard-coded height --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index efaa0f1dd0..f057701f60 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -238,9 +238,10 @@ Popup Cura.ContainerManager.clearUserContainers() } } + Rectangle { - height: 1 + height: UM.Theme.getSize("default_lining").width anchors.left: parent.left anchors.right: parent.right color: borderColor From ba805b9da3f4d26f7bb9dda45b6ab148dacba786 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 12:26:56 +0200 Subject: [PATCH 545/994] Fix QML errors CURA-6849 --- resources/qml/Preferences/ProfileTab.qml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/ProfileTab.qml b/resources/qml/Preferences/ProfileTab.qml index 12846cf99b..3c0c46ed72 100644 --- a/resources/qml/Preferences/ProfileTab.qml +++ b/resources/qml/Preferences/ProfileTab.qml @@ -38,14 +38,28 @@ Tab property var setting: qualitySettings.getItem(styleData.row) height: childrenRect.height width: (parent != null) ? parent.width : 0 - text: (styleData.value.substr(0,1) == "=") ? styleData.value : "" + text: + { + if (styleData.value === undefined) + { + return "" + } + return (styleData.value.substr(0,1) == "=") ? styleData.value : "" + } Label { anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.right: parent.right - text: (styleData.value.substr(0,1) == "=") ? catalog.i18nc("@info:status", "Calculated") : styleData.value + text: + { + if (styleData.value === undefined) + { + return "" + } + return (styleData.value.substr(0,1) == "=") ? catalog.i18nc("@info:status", "Calculated") : styleData.value + } font.strikeout: styleData.column == 1 && setting.user_value != "" && base.isQualityItemCurrentlyActivated font.italic: setting.profile_value_source == "quality_changes" || (setting.user_value != "" && base.isQualityItemCurrentlyActivated) opacity: font.strikeout ? 0.5 : 1 From 26b523f190b4c819720294aaaa77e8ef6b46d84d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 12:37:08 +0200 Subject: [PATCH 546/994] Fix quality profile menu size CURA-6838 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index f057701f60..dfd532e34c 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -261,7 +261,9 @@ Popup contentItem: Item { - width: manageProfilesButton.width + width: parent.width + height: childrenRect.height + Label { id: textLabel From 027768f151e60467414ef7bfc3bdb5549d6b054d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 12:56:20 +0200 Subject: [PATCH 547/994] Use machine def id as quality_definition fallback CURA-6847 --- cura/Settings/CuraContainerRegistry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 557246ab1b..6aadb9bc6f 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -238,7 +238,7 @@ class CuraContainerRegistry(ContainerRegistry): # Get the expected machine definition. # i.e.: We expect gcode for a UM2 Extended to be defined as normal UM2 gcode... - profile_definition = machine_definition.getMetaDataEntry("quality_definition", "") + profile_definition = machine_definition.getMetaDataEntry("quality_definition", machine_definition.getId()) expected_machine_definition = container_tree.machines[global_stack.definition.getId()].quality_definition # And check if the profile_definition matches either one (showing error if not): From bd84c4d98d66f0039e26ff4bb9c95cd513d3a2d1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 14:18:49 +0200 Subject: [PATCH 548/994] Show quality and intent a custom profile is based on CURA-6846 --- cura/Settings/MachineManager.py | 24 +++++++++++++++++++ .../Custom/CustomPrintSetup.qml | 12 ++++++---- .../PrintSetupSelectorHeader.qml | 13 ++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 0cd70970c8..37789b23a1 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -629,6 +629,16 @@ class MachineManager(QObject): intent_category = category return intent_category + # Returns the human-readable name of the active intent category. If the intent category is "default", returns an + # empty string. + @pyqtProperty(str, notify = activeIntentChanged) + def activeIntentName(self) -> str: + intent_category = self.activeIntentCategory + if intent_category == "default": + intent_category = "" + intent_name = intent_category.capitalize() + return intent_name + # Provies a list of extruder positions that have a different intent from the active one. @pyqtProperty("QStringList", notify=activeIntentChanged) def extruderPositionsWithNonActiveIntent(self): @@ -1663,11 +1673,25 @@ class MachineManager(QObject): return global_container_stack.qualityChanges.getName() return global_container_stack.quality.getName() + @pyqtProperty(str, notify = activeQualityChanged) + def activeQualityName(self) -> str: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return empty_quality_container.getName() + return global_stack.quality.getName() + @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() return (not global_container_stack is None) and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container + @pyqtProperty(bool, notify = activeQualityGroupChanged) + def isActiveQualityCustom(self) -> bool: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return False + return global_stack.qualityChanges != empty_quality_changes_container + def _updateUponMaterialMetadataChange(self) -> None: if self._global_container_stack is None: return diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index c45a5fa8d7..33e2888fbb 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -88,14 +88,18 @@ Item function generateActiveQualityText() { + var result = Cura.MachineManager.activeQualityOrQualityChangesName - var result = "" - if(Cura.MachineManager.activeIntentCategory != "default") + // If this is a custom quality, add intent (if present) and quality it is based on + if (Cura.MachineManager.isActiveQualityCustom) { - result += Cura.MachineManager.activeIntentCategory + " - " + if (Cura.MachineManager.activeIntentName != "") + { + result += " - " + Cura.MachineManager.activeIntentName + } + result += " - " + Cura.MachineManager.activeQualityName } - result += Cura.MachineManager.activeQualityOrQualityChangesName if (Cura.MachineManager.isActiveQualityExperimental) { result += " (Experimental)" diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 5628867922..9340f64d89 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -20,13 +20,18 @@ RowLayout { if (Cura.MachineManager.activeStack) { - var text = "" - if(Cura.MachineManager.activeIntentCategory != "default") + var text = Cura.MachineManager.activeQualityOrQualityChangesName + + // If this is a custom quality, add intent (if present) and quality it is based on + if (Cura.MachineManager.isActiveQualityCustom) { - text += Cura.MachineManager.activeIntentCategory + " - " + if (Cura.MachineManager.activeIntentName != "") + { + text += " - " + Cura.MachineManager.activeIntentName + } + text += " - " + Cura.MachineManager.activeQualityName } - text += Cura.MachineManager.activeQualityOrQualityChangesName if (!Cura.MachineManager.hasNotSupportedQuality) { text += " - " + layerHeight.properties.value + "mm" From a135a3f328207d0998096c82a945ca93ba6acc84 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Thu, 3 Oct 2019 15:52:38 +0200 Subject: [PATCH 549/994] LW&Speed_Update --- .../Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 15 +++++++-------- .../Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 9 ++++----- .../Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 7 +++---- .../Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg | 3 +-- .../Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg | 3 +-- .../Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg | 3 +-- .../Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 5 ++--- .../Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 5 ++--- .../Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 5 ++--- .../Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 15 +++++++-------- .../Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 15 +++++++-------- .../Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 15 +++++++-------- .../s3d_std0.6_Nylon-1030_C.inst.cfg | 3 +-- .../Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 13 ++++++------- .../Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 13 ++++++------- .../Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 13 ++++++------- .../Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 17 ++++++++--------- .../Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 17 ++++++++--------- .../Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 17 ++++++++--------- .../Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 7 +++---- .../Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg | 13 ++++++------- .../Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg | 13 ++++++------- .../Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg | 13 ++++++------- 46 files changed, 209 insertions(+), 255 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index bfb18a444c..d04c647069 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 0cef5ae255..9f8de69188 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index 08ee21c497..b3cac1b12a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 65 -speed_wall = =math.ceil(speed_print * 45/65) -speed_wall_0 = =math.ceil(speed_wall * 35/45) -speed_topbottom = =math.ceil(speed_print * 40/65) -speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index 4a74ad71eb..d465336791 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 25/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 50 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index ea6db301d7..cd61144efb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 27/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 50 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index 6c6dad3992..0c198a0a0c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 65 -speed_wall = =math.ceil(speed_print * 45/65) -speed_wall_0 = =math.ceil(speed_wall * 30/45) -speed_topbottom = =math.ceil(speed_print * 40/65) -speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 50 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index a0546f6d8e..2442ff5d41 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index 2cfc241aa7..0401561aba 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index 50cfb4c11e..a49104f40d 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 65 -speed_wall = =math.ceil(speed_print * 45/65) -speed_wall_0 = =math.ceil(speed_wall * 35/45) -speed_topbottom = =math.ceil(speed_print * 40/65) -speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 8fb7ba8ed5..56e2c689b0 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 28ad37478e..7d3a8c8fd5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) @@ -42,7 +41,7 @@ skin_overlap = 15 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = ==line_width*0.175/line_width +support_xy_distance_overhang = =line_width*0.175/line_width support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 544ba3b0bf..79859858e8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index f86140b415..85eaa2fc56 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index 3036cbc215..33bc2c7fdf 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index dd2a2f0c94..4b49fb759c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index 39fb0ba390..bda2a4f342 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 3a6babd860..9c75b69e1e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index bd418bccd6..f754280aae 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.35 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 896c44ea06..3fe9caa365 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -14,9 +14,8 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 30 speed_wall = =math.ceil(speed_print * 30/30) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 7c8aa8553a..f6a6d04ef4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -14,9 +14,8 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 35 speed_wall = =math.ceil(speed_print * 35/35) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index e1fc3c9935..6f95be4f77 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -14,9 +14,8 @@ variant = Standard 0.4 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 40/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 2f0b6ade1e..808e7c19b6 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 37/50) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index f6ba60245c..9d45df7783 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 55 speed_wall = =math.ceil(speed_print * 40/55) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 534de977fe..1c9f284bac 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 60 speed_wall = =math.ceil(speed_print * 43/60) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index 698feba6d5..e2a6a2eefb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index c3a1ff764a..ed36b40b41 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 27/60) +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 3f2c6a8617..1e01699a46 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 65 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 3/4) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 35/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index faf731cabd..8943e85979 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -14,9 +14,8 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 55 speed_wall = =math.ceil(speed_print * 40/55) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index 6229c8a8c0..62ed7a1f6b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 45 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_wall = =math.ceil(speed_print * 33/45) +speed_wall_0 = =math.ceil(speed_wall * 23/33) +speed_topbottom = =math.ceil(speed_print * 30/45) +speed_layer_0 = =math.ceil(speed_print * 23/45) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 70 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index ad25d6a6b3..2588f8cc57 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 70 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 48fc342581..11c0286731 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 55 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 27/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 70 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 8ec601e30f..3dc53a4f4e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index 6a4c1bfecc..faed401603 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index 676cffd1f1..e3af54a0fe 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -13,16 +13,15 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 65 -speed_wall = =math.ceil(speed_print * 3/4) -speed_wall_0 = =math.ceil(speed_wall * 2/3) -speed_topbottom = =math.ceil(speed_print * 2/3) -speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 1caddc5543..86fcc42f19 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index f4b98ed47c..5f6b13231e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index ffe642001e..bbee20e22c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index ecdcfa2b49..964d1a51d0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index 6d719613f1..bc9529d67c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index a30598c298..a6a9dad353 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 95fc12cacb..8f3e1117d3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index 190d73029a..28f0e8972c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index 53d2e8b1da..afdfd75dd5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index b80711fe8d..1d8c019534 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -13,15 +13,14 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.59 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 wall_0_wipe_dist = =machine_nozzle_size speed_print = 35 -speed_wall = =math.ceil(speed_print * 4/4) -speed_wall_0 = =math.ceil(speed_wall * 3/4) -speed_topbottom = =math.ceil(speed_print * 2/3) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 25/35) speed_support = =speed_wall_0 speed_layer_0 = =math.ceil(speed_print * 20/35) speed_slowdown_layers = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index 69db96ff85..ba0d23d5cd 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -13,15 +13,14 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.59 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 wall_0_wipe_dist = =machine_nozzle_size speed_print = 40 -speed_wall = =math.ceil(speed_print * 4/4) -speed_wall_0 = =math.ceil(speed_wall * 3/4) -speed_topbottom = =math.ceil(speed_print * 2/3) +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 27/40) speed_support = =speed_wall_0 speed_layer_0 = =math.ceil(speed_print * 20/40) speed_slowdown_layers = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index a0a90933e2..b7c6503630 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -13,15 +13,14 @@ variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.59 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 wall_0_wipe_dist = =machine_nozzle_size speed_print = 45 -speed_wall = =math.ceil(speed_print * 4/4) -speed_wall_0 = =math.ceil(speed_wall * 3/4) -speed_topbottom = =math.ceil(speed_print * 2/3) +speed_wall = =math.ceil(speed_print * 45/45) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 30/45) speed_layer_0 = =math.ceil(speed_print * 20/45) speed_slowdown_layers = 1 cool_fan_enabled = True From 877bb1efdbd4a649533cefaf33f790c894456209 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 15:55:38 +0200 Subject: [PATCH 550/994] Diable local printer ListView buffer to force redraw CURA-6793 --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 6b074d2d8e..e4a7a98308 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -86,7 +86,11 @@ Item { id: machineList - cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. + // CURA-6793 + // Enabling the buffer seems to cause the blank items issue. When buffer is enabled, if the ListView's + // individual item has a dynamic change on its visibility, the ListView doesn't redraw itself. + // The default value of cacheBuffer is platform-dependent, so we explicitly disable it here. + cacheBuffer: 0 model: UM.DefinitionContainersModel { From 44290d371507940d87cc270b7e869c9bf3c0e780 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Thu, 3 Oct 2019 16:00:55 +0200 Subject: [PATCH 551/994] setting_version_update --- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_A.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_B.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_C.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_D.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_E.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_F.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_G.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_H.inst.cfg | 2 +- resources/variants/strateo3d_standard_04.inst.cfg | 2 +- resources/variants/strateo3d_standard_06.inst.cfg | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index d04c647069..a3260a32f4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 9f8de69188..648ec5520c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index b3cac1b12a..e3fe5f49fc 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index d465336791..8482d229ce 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index cd61144efb..fdddcfbdf5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index 0c198a0a0c..841c23b837 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index 2442ff5d41..ff541e9c67 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index 0401561aba..291ea81dc8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index a49104f40d..7afac5304e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 56e2c689b0..19d8247456 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 7d3a8c8fd5..44e5609b3f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 79859858e8..b4cc317f50 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index 85eaa2fc56..eb8bd0a020 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index 33bc2c7fdf..a25f57b3e7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index 4b49fb759c..6222d946e0 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index bda2a4f342..774a985511 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 9c75b69e1e..72429d945b 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index f754280aae..09c540498e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 3fe9caa365..7c31ab6b41 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index f6a6d04ef4..67fb9d5dcb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index 6f95be4f77..fbe0f733cc 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 808e7c19b6..517a0d9943 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 9d45df7783..0a55c5fef6 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 1c9f284bac..6128889e8c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index e2a6a2eefb..af9b874470 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index ed36b40b41..1ee8fcd291 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 1e01699a46..9922045d01 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index 8943e85979..f8b58f5600 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index 62ed7a1f6b..a837a8f969 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index 2588f8cc57..92cba1ea19 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 11c0286731..a1e04e4789 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 3dc53a4f4e..e70d84ddd8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index faed401603..fe9d215acb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index e3af54a0fe..233ea10e27 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 86fcc42f19..05ae1383eb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index 5f6b13231e..7507968a69 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index bbee20e22c..ea68f30f33 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index 964d1a51d0..915e0f3b83 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index bc9529d67c..b9c260eb2c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index a6a9dad353..7e1237eb55 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 8f3e1117d3..f5fed6dc2e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index 28f0e8972c..033c0e03bd 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index afdfd75dd5..9e457f7d73 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index 1d8c019534..8d152328ad 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index ba0d23d5cd..78483d0238 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index b7c6503630..de5110ef46 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index a8b7219a3a..bf649d61ef 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 7a949c7fe5..55d6d20323 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 003e0660c8..8c3215ebc1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 957f20205b..4a12fffb1e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 817384f951..a5f01107f8 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index 4551376434..6042de9501 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index 929227857d..405bc3db13 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index 53621b3e93..b52bd3e5a1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 0cfc4081c2..8b65fa78bd 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 80e9934540..5cf1c2c5a9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index c597412185..e514ce8425 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index def6799406..883c733088 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index 569188ff3c..b7ec8a65db 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index b83b16b3ff..fcea53fbe5 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 368cbf59f0..61a455827c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg index 0fe2705fbd..7f29e29d88 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -4,7 +4,7 @@ name = H definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = h weight = -1 diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index 36765ea8cf..69a9bedd9e 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = a weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index afb61bb3b3..dbfd0c46f6 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index a0db1a5af4..e167da5fdb 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index 3d52f5d331..b1a00232ed 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -4,7 +4,7 @@ name = Medium Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index d3ce741a0d..ee2e45b511 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = e weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index 842e579f73..bc1bf264f3 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = f weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index a5dcd8c000..634cebecf6 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = g weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index 273ab89ba9..ea1a751190 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse Quality definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = h weight = 0 diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg index ee249049d8..29cd075177 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg index 5458f1f7cb..b4618f2bd8 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle From 38ae0e75f2914bafcf2a326ebcc1624e291fcf05 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 3 Oct 2019 16:25:09 +0200 Subject: [PATCH 552/994] Fallback to fdmprinter if not has_machine_quality Contributes to issue CURA-6847. --- cura/Settings/CuraContainerRegistry.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 6aadb9bc6f..bd5269e874 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -21,6 +21,7 @@ from UM.Message import Message from UM.Platform import Platform from UM.PluginRegistry import PluginRegistry # For getting the possible profile writers to write with. from UM.Resources import Resources +from UM.Util import parseBool from cura.ReaderWriters.ProfileWriter import ProfileWriter from . import ExtruderStack @@ -238,7 +239,8 @@ class CuraContainerRegistry(ContainerRegistry): # Get the expected machine definition. # i.e.: We expect gcode for a UM2 Extended to be defined as normal UM2 gcode... - profile_definition = machine_definition.getMetaDataEntry("quality_definition", machine_definition.getId()) + has_machine_quality = parseBool(machine_definition.getMetaDataEntry("has_machine_quality", "false")) + profile_definition = machine_definition.getMetaDataEntry("quality_definition", machine_definition.getId()) if has_machine_quality else "fdmprinter" expected_machine_definition = container_tree.machines[global_stack.definition.getId()].quality_definition # And check if the profile_definition matches either one (showing error if not): From f8951e4140488a0ffa2c09e1953388a83c582e53 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 4 Oct 2019 09:39:26 +0200 Subject: [PATCH 553/994] Add scrollbar to profile dropdown CURA-6843 --- .../Custom/QualitiesWithIntentMenu.qml | 267 +++++++++--------- 1 file changed, 138 insertions(+), 129 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index dfd532e34c..78925028a1 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -41,147 +41,156 @@ Popup contentItem: Column { // This repeater adds the intent labels - Repeater + ScrollView { - model: dataModel - delegate: Item - { - // We need to set it like that, otherwise we'd have to set the sub model with model: model.qualities - // Which obviously won't work due to naming conflicts. - property variant subItemModel: model.qualities + property real maximumHeight: screenScaleFactor * 400 - height: childrenRect.height - anchors - { - left: parent.left - right: parent.right - } + height: Math.min(contentHeight, maximumHeight) + clip: true - Label - { - id: headerLabel - text: model.name - renderType: Text.NativeRendering - height: visible ? contentHeight: 0 - enabled: false - visible: qualitiesList.visibleChildren.length > 0 - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - } - - Column - { - id: qualitiesList - anchors.top: headerLabel.bottom - anchors.left: parent.left - anchors.right: parent.right - - // We set it by means of a binding, since then we can use the when condition, which we need to - // prevent a binding loop. - Binding - { - target: parent - property: "height" - value: parent.childrenRect.height - when: parent.visibleChildren.length > 0 - } - - // Add the qualities that belong to the intent - Repeater - { - visible: false - model: subItemModel - MenuButton - { - id: button - - onClicked: Cura.IntentManager.selectIntent(model.intent_category, model.quality_type) - - width: parent.width - checkable: true - visible: model.available - text: model.name + " - " + model.layer_height + " mm" - checked: - { - if (Cura.MachineManager.hasCustomQuality) - { - // When user created profile is active, no quality tickbox should be active. - return false; - } - return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category; - } - ButtonGroup.group: buttonGroup - } - } - } - } - } - - //Another "intent category" for custom profiles. - Item - { - height: childrenRect.height - anchors - { - left: parent.left - right: parent.right - } - - Label - { - id: customProfileHeader - text: catalog.i18nc("@label:header", "Custom profiles") - renderType: Text.NativeRendering - height: visible ? contentHeight: 0 - enabled: false - visible: profilesList.visibleChildren.length > 1 - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - } + ScrollBar.vertical.policy: height == maximumHeight ? ScrollBar.AlwaysOn: ScrollBar.AlwaysOff Column { - id: profilesList - anchors - { - top: customProfileHeader.bottom - left: parent.left - right: parent.right - } - - //We set it by means of a binding, since then we can use the - //"when" condition, which we need to prevent a binding loop. - Binding - { - target: parent - property: "height" - value: parent.childrenRect.height - when: parent.visibleChildren.length > 1 - } - - //Add all the custom profiles. + width: parent.width Repeater { - model: Cura.CustomQualityProfilesDropDownMenuModel - MenuButton + model: dataModel + delegate: Item { - onClicked: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group) + // We need to set it like that, otherwise we'd have to set the sub model with model: model.qualities + // Which obviously won't work due to naming conflicts. + property variant subItemModel: model.qualities - width: parent.width - checkable: true - visible: model.available - text: model.name - checked: + height: childrenRect.height + width: popup.contentWidth + + Label { - var active_quality_group = Cura.MachineManager.activeQualityChangesGroup - - if (active_quality_group != null) - { - return active_quality_group.name == model.quality_changes_group.name - } - return false + id: headerLabel + text: model.name + renderType: Text.NativeRendering + height: visible ? contentHeight: 0 + enabled: false + visible: qualitiesList.visibleChildren.length > 0 + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + } + + Column + { + id: qualitiesList + anchors.top: headerLabel.bottom + anchors.left: parent.left + anchors.right: parent.right + + // We set it by means of a binding, since then we can use the when condition, which we need to + // prevent a binding loop. + Binding + { + target: parent + property: "height" + value: parent.childrenRect.height + when: parent.visibleChildren.length > 0 + } + + // Add the qualities that belong to the intent + Repeater + { + visible: false + model: subItemModel + MenuButton + { + id: button + + onClicked: Cura.IntentManager.selectIntent(model.intent_category, model.quality_type) + + width: parent.width + checkable: true + visible: model.available + text: model.name + " - " + model.layer_height + " mm" + checked: + { + if (Cura.MachineManager.hasCustomQuality) + { + // When user created profile is active, no quality tickbox should be active. + return false; + } + return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category; + } + ButtonGroup.group: buttonGroup + } + } + } + } + } + //Another "intent category" for custom profiles. + Item + { + height: childrenRect.height + anchors + { + left: parent.left + right: parent.right + } + + Label + { + id: customProfileHeader + text: catalog.i18nc("@label:header", "Custom profiles") + renderType: Text.NativeRendering + height: visible ? contentHeight: 0 + enabled: false + visible: profilesList.visibleChildren.length > 1 + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + } + + Column + { + id: profilesList + anchors + { + top: customProfileHeader.bottom + left: parent.left + right: parent.right + } + + //We set it by means of a binding, since then we can use the + //"when" condition, which we need to prevent a binding loop. + Binding + { + target: parent + property: "height" + value: parent.childrenRect.height + when: parent.visibleChildren.length > 1 + } + + //Add all the custom profiles. + Repeater + { + model: Cura.CustomQualityProfilesDropDownMenuModel + MenuButton + { + onClicked: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group) + + width: parent.width + checkable: true + visible: model.available + text: model.name + checked: + { + var active_quality_group = Cura.MachineManager.activeQualityChangesGroup + + if (active_quality_group != null) + { + return active_quality_group.name == model.quality_changes_group.name + } + return false + } + ButtonGroup.group: buttonGroup + } } - ButtonGroup.group: buttonGroup } } } From 61a1b61756e4d977719884091dd26b0c53c2de46 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 10:27:35 +0200 Subject: [PATCH 554/994] Remove unnecessary activeQualityName property CURA-6846 --- cura/Settings/MachineManager.py | 8 -------- .../qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 +- .../qml/PrintSetupSelector/PrintSetupSelectorHeader.qml | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 37789b23a1..4518304680 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -656,7 +656,6 @@ class MachineManager(QObject): return result - ## Returns whether there is anything unsupported in the current set-up. # # The current set-up signifies the global stack and all extruder stacks, @@ -1673,13 +1672,6 @@ class MachineManager(QObject): return global_container_stack.qualityChanges.getName() return global_container_stack.quality.getName() - @pyqtProperty(str, notify = activeQualityChanged) - def activeQualityName(self) -> str: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if global_stack is None: - return empty_quality_container.getName() - return global_stack.quality.getName() - @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 33e2888fbb..55ae33b134 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -97,7 +97,7 @@ Item { result += " - " + Cura.MachineManager.activeIntentName } - result += " - " + Cura.MachineManager.activeQualityName + result += " - " + Cura.MachineManager.activeQualityGroup.getName() } if (Cura.MachineManager.isActiveQualityExperimental) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 9340f64d89..affe514bd8 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -29,7 +29,7 @@ RowLayout { text += " - " + Cura.MachineManager.activeIntentName } - text += " - " + Cura.MachineManager.activeQualityName + text += " - " + Cura.MachineManager.activeQualityGroup.getName() } if (!Cura.MachineManager.hasNotSupportedQuality) From c86f28cc9eea455b0c4d66998253f9a8243c24a8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 4 Oct 2019 10:33:13 +0200 Subject: [PATCH 555/994] Ignore disabled extruders when checking for intent warning CURA-6601 --- cura/Settings/MachineManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 37789b23a1..62f22431c0 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -650,6 +650,8 @@ class MachineManager(QObject): active_intent_category = self.activeIntentCategory result = [] for extruder in global_container_stack.extruderList: + if not extruder.isEnabled: + continue category = extruder.intent.getMetaDataEntry("intent_category", "default") if category != active_intent_category: result.append(str(int(extruder.getMetaDataEntry("position")) + 1)) @@ -1054,6 +1056,7 @@ class MachineManager(QObject): self.forceUpdateAllSettings() # Also trigger the build plate compatibility to update self.activeMaterialChanged.emit() + self.activeIntentChanged.emit() def _onMachineNameChanged(self) -> None: self.globalContainerChanged.emit() From 7233bdb2559407989c449e634a998ab2cbf24c5a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 10:36:57 +0200 Subject: [PATCH 556/994] Fix TestMachineNode: remove invalid property has_machine_materials --- tests/Machines/TestMachineNode.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index 4582f4c87d..270c2503e6 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -55,7 +55,6 @@ def test_metadataProperties(container_registry): # Check if each of the metadata entries got stored properly. assert not node.has_materials assert node.has_variants - assert node.has_machine_materials assert node.has_machine_quality assert node.quality_definition == metadata_dict["quality_definition"] assert node.exclude_materials == metadata_dict["exclude_materials"] From 5bd5875a20b7aa87695403d7e262a8c75b010bad Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 4 Oct 2019 10:39:02 +0200 Subject: [PATCH 557/994] Also add intent warning to custom print setup CURA-6601 --- .../PrintSetupSelector/Custom/CustomPrintSetup.qml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 55ae33b134..cae34dc5c5 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -7,7 +7,7 @@ import QtQuick.Controls 1.4 as OldControls import UM 1.3 as UM import Cura 1.6 as Cura - +import ".." Item { @@ -50,6 +50,18 @@ Item verticalAlignment: Text.AlignVCenter } + NoIntentIcon + { + affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent + intent_type: Cura.MachineManager.activeIntentCategory + anchors.right: intentSelection.left + anchors.rightMargin: UM.Theme.getSize("narrow_margin").width + width: Math.round(profileLabel.height * 0.5) + anchors.verticalCenter: parent.verticalCenter + height: width + visible: affected_extruders.length + } + Button { id: intentSelection From e5c59b130894562be5cbea72ca8d9e42ea561721 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 10:59:28 +0200 Subject: [PATCH 558/994] Fix TestVariantNode --- tests/Machines/TestVariantNode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index e04c369762..954904908b 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -13,13 +13,13 @@ material_node_added_test_data = [({"type": "Not a material"}, ["material_1", "ma ({"type": "material", "base_file": "material_3"}, ["material_1", "material_2"]), # material_3 is on the "NOPE" list. ({"type": "material", "base_file": "material_4", "definition": "machine_3"}, ["material_1", "material_2"]), # Wrong machine ({"type": "material", "base_file": "material_4", "definition": "machine_1"}, ["material_1", "material_2"]), # No variant - ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant": "Variant Three"}, ["material_1", "material_2"]), # Wrong variant - ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant": "Variant One"}, ["material_1", "material_2", "material_4"]) + ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant_name": "Variant Three"}, ["material_1", "material_2"]), # Wrong variant + ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant_name": "Variant One"}, ["material_1", "material_2", "material_4"]) ] -material_node_update_test_data = [({"type": "material", "base_file": "material_1", "definition": "machine_1", "variant": "Variant One"}, ["material_1"], ["material_2"]), - ({"type": "material", "base_file": "material_1", "definition": "fdmprinter", "variant": "Variant One"}, [], ["material_2", "material_1"]), # Too generic - ({"type": "material", "base_file": "material_1", "definition": "machine_2", "variant": "Variant One"}, [], ["material_2", "material_1"]) # Wrong definition +material_node_update_test_data = [({"type": "material", "base_file": "material_1", "definition": "machine_1", "variant_name": "Variant One"}, ["material_1"], ["material_2"]), + ({"type": "material", "base_file": "material_1", "definition": "fdmprinter", "variant_name": "Variant One"}, [], ["material_2", "material_1"]), # Too generic + ({"type": "material", "base_file": "material_1", "definition": "machine_2", "variant_name": "Variant One"}, [], ["material_2", "material_1"]) # Wrong definition ] metadata_dict = {} From 68f334e141896e3d9e09e4bd59da28ff4e8bb5cf Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 4 Oct 2019 11:21:25 +0200 Subject: [PATCH 559/994] Fix: Consider all active extruder intent profiles for display. Remove the notion of a singular 'active' extruder from the code. Visibility of intent profiles should consider all enabled extruders. This fix makes sure that it doesn't matter in what order materials are loaded, the available intent profiles will be the same. CURA-6840 --- cura/Machines/Models/IntentModel.py | 91 +++++++++++++++-------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index e105f012cd..c4dd99a533 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -1,18 +1,15 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - -from typing import Optional, List, Dict, Any +from typing import Optional, Dict, Any, Set, List from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal +import cura.CuraApplication from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.SettingFunction import SettingFunction - +from cura.Machines import MaterialNode, QualityGroup from cura.Machines.ContainerTree import ContainerTree -from cura.Settings.ExtruderManager import ExtruderManager -from cura.Settings.IntentManager import IntentManager -import cura.CuraApplication class IntentModel(ListModel): @@ -65,47 +62,16 @@ class IntentModel(ListModel): return quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() - container_tree = ContainerTree.getInstance() - machine_node = container_tree.machines[global_stack.definition.getId()] - - # We can't just look at the active extruder, since it is possible for only one extruder to have an intent - # and the other extruders have no intent (eg, default). It is not possible for one extruder to have intent A and - # the other to have B. - # So we will use the first extruder that we find that has an intent that is not default as the "active" extruder - - active_extruder = None - for extruder in global_stack.extruderList: - if not extruder.isEnabled: - continue - if extruder.intent.getMetaDataEntry("intent_category", "default") == "default": - if active_extruder is None: - active_extruder = extruder # If there is no extruder found and the intent is default, use that. - else: # We found an intent, use that extruder as "active" - active_extruder = extruder - - if not active_extruder: - return - active_variant_name = active_extruder.variant.getMetaDataEntry("name") - active_variant_node = machine_node.variants[active_variant_name] - active_material_node = active_variant_node.materials[active_extruder.material.getMetaDataEntry("base_file")] + material_nodes = self._get_active_materials() layer_heights_added = [] - for quality_id, quality_node in active_material_node.qualities.items(): - if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). - continue - quality_group = quality_groups[quality_node.quality_type] - layer_height = self._fetchLayerHeight(quality_group) - for intent_id, intent_node in quality_node.intents.items(): - if intent_node.intent_category != self._intent_category: - continue - layer_heights_added.append(layer_height) - new_items.append({"name": quality_group.name, - "quality_type": quality_group.quality_type, - "layer_height": layer_height, - "available": quality_group.is_available, - "intent_category": self._intent_category - }) + for material_node in material_nodes: + intents = self._get_intents_for_material(material_node, quality_groups) + for intent in intents: + if intent["layer_height"] not in layer_heights_added: + new_items.append(intent) + layer_heights_added.append(intent["layer_height"]) # Now that we added all intents that we found something for, ensure that we set add ticks (and layer_heights) # for all groups that we don't have anything for (and set it to not available) @@ -124,8 +90,43 @@ class IntentModel(ListModel): new_items = sorted(new_items, key=lambda x: x["layer_height"]) self.setItems(new_items) + ## Get the active materials for all extruders. No duplicates will be returned + def _get_active_materials(self) -> Set[MaterialNode]: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + container_tree = ContainerTree.getInstance() + machine_node = container_tree.machines[global_stack.definition.getId()] + nodes = set([]) + + for extruder in global_stack.extruderList: + active_variant_name = extruder.variant.getMetaDataEntry("name") + active_variant_node = machine_node.variants[active_variant_name] + active_material_node = active_variant_node.materials[extruder.material.getMetaDataEntry("base_file")] + nodes.add(active_material_node) + + return nodes + + def _get_intents_for_material(self, active_material_node: MaterialNode, quality_groups: Dict[str, QualityGroup]) -> List[Dict[str, Any]]: + extruder_intents = [] # type: List[Dict[str, Any]] + + for quality_id, quality_node in active_material_node.qualities.items(): + if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). + continue + quality_group = quality_groups[quality_node.quality_type] + layer_height = self._fetchLayerHeight(quality_group) + + for intent_id, intent_node in quality_node.intents.items(): + if intent_node.intent_category != self._intent_category: + continue + extruder_intents.append({"name": quality_group.name, + "quality_type": quality_group.quality_type, + "layer_height": layer_height, + "available": quality_group.is_available, + "intent_category": self._intent_category + }) + return extruder_intents + #TODO: Copied this from QualityProfilesDropdownMenuModel for the moment. This code duplication should be fixed. - def _fetchLayerHeight(self, quality_group) -> float: + def _fetchLayerHeight(self, quality_group: QualityGroup) -> float: global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine if not self._layer_height_unit: unit = global_stack.definition.getProperty("layer_height", "unit") From 618cbffaa7773fca8dc5eb7ddb2fd3002f85eea8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 11:46:59 +0200 Subject: [PATCH 560/994] Apply screenScaleFactor to implicitWidth (and cleanup) --- resources/qml/LabelBar.qml | 2 +- .../Recommended/RecommendedQualityProfileSelector.qml | 3 ++- resources/qml/RadioCheckbar.qml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/qml/LabelBar.qml b/resources/qml/LabelBar.qml index 9a870811ca..007c5f1f54 100644 --- a/resources/qml/LabelBar.qml +++ b/resources/qml/LabelBar.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.3 import UM 1.2 as UM -// The labelBar shows a set of labels that are evenly spaced from oneother. +// The labelBar shows a set of labels that are evenly spaced from one another. // The first item is aligned to the left, the last is aligned to the right. // It's intended to be used together with RadioCheckBar. As such, it needs // to know what the used itemSize is, so it can ensure the labels are aligned correctly. diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 99a1d25138..d1f7dd7de2 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -9,6 +9,7 @@ import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM import Cura 1.6 as Cura import ".." + Item { id: qualityRow diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 0ce84ad8ca..dfd9ca8628 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -19,7 +19,7 @@ Item property int barSize: UM.Theme.getSize("slider_groove_radius").height property var isCheckedFunction // Function that accepts the modelItem and returns if the item should be active. - implicitWidth: 200 + implicitWidth: 200 * screenScaleFactor implicitHeight: checkboxSize property var dataModel: null @@ -62,7 +62,7 @@ Item Layout.fillHeight: true // The last item of the repeater needs to be shorter, as we don't need another part to fit // the horizontal bar. The others should essentially not be limited. - Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 + Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width : 200000000 property bool isEnabled: model.available // The horizontal bar between the checkable options. From 88e0a57374c843d91520f55cdcb77b2193c2903e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 4 Oct 2019 13:25:58 +0200 Subject: [PATCH 561/994] Fix typing and deduplicate fetch_layer_height CURA-6840 --- cura/Machines/Models/IntentModel.py | 41 +++------------- cura/Machines/Models/MachineModelUtils.py | 33 +++++++++++++ .../QualityProfilesDropDownMenuModel.py | 48 ++++--------------- 3 files changed, 49 insertions(+), 73 deletions(-) create mode 100644 cura/Machines/Models/MachineModelUtils.py diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index c4dd99a533..1daa1096e0 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -7,9 +7,10 @@ from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal import cura.CuraApplication from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Settings.SettingFunction import SettingFunction -from cura.Machines import MaterialNode, QualityGroup from cura.Machines.ContainerTree import ContainerTree +from cura.Machines.MaterialNode import MaterialNode +from cura.Machines.Models.MachineModelUtils import fetch_layer_height +from cura.Machines.QualityGroup import QualityGroup class IntentModel(ListModel): @@ -78,7 +79,7 @@ class IntentModel(ListModel): for quality_tuple, quality_group in quality_groups.items(): # Add the intents that are of the correct category if quality_tuple[0] != self._intent_category: - layer_height = self._fetchLayerHeight(quality_group) + layer_height = fetch_layer_height(quality_group) if layer_height not in layer_heights_added: new_items.append({"name": "Unavailable", "quality_type": "", @@ -95,7 +96,7 @@ class IntentModel(ListModel): global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() container_tree = ContainerTree.getInstance() machine_node = container_tree.machines[global_stack.definition.getId()] - nodes = set([]) + nodes = set() # type: Set[MaterialNode] for extruder in global_stack.extruderList: active_variant_name = extruder.variant.getMetaDataEntry("name") @@ -112,7 +113,7 @@ class IntentModel(ListModel): if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). continue quality_group = quality_groups[quality_node.quality_type] - layer_height = self._fetchLayerHeight(quality_group) + layer_height = fetch_layer_height(quality_group) for intent_id, intent_node in quality_node.intents.items(): if intent_node.intent_category != self._intent_category: @@ -125,35 +126,5 @@ class IntentModel(ListModel): }) return extruder_intents - #TODO: Copied this from QualityProfilesDropdownMenuModel for the moment. This code duplication should be fixed. - def _fetchLayerHeight(self, quality_group: QualityGroup) -> float: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine - if not self._layer_height_unit: - unit = global_stack.definition.getProperty("layer_height", "unit") - if not unit: - unit = "" - self._layer_height_unit = unit - - default_layer_height = global_stack.definition.getProperty("layer_height", "value") - - # Get layer_height from the quality profile for the GlobalStack - if quality_group.node_for_global is None: - return float(default_layer_height) - container = quality_group.node_for_global.container - - layer_height = default_layer_height - if container and container.hasProperty("layer_height", "value"): - layer_height = container.getProperty("layer_height", "value") - else: - # Look for layer_height in the GlobalStack from material -> definition - container = global_stack.definition - if container and container.hasProperty("layer_height", "value"): - layer_height = container.getProperty("layer_height", "value") - - if isinstance(layer_height, SettingFunction): - layer_height = layer_height(global_stack) - - return float(layer_height) - def __repr__(self): return str(self.items) diff --git a/cura/Machines/Models/MachineModelUtils.py b/cura/Machines/Models/MachineModelUtils.py new file mode 100644 index 0000000000..3e94f4f010 --- /dev/null +++ b/cura/Machines/Models/MachineModelUtils.py @@ -0,0 +1,33 @@ +from typing import TYPE_CHECKING + +from UM.Settings.SettingFunction import SettingFunction + +if TYPE_CHECKING: + from cura.Machines.QualityGroup import QualityGroup + +layer_height_unit = "" + +def fetch_layer_height(quality_group: "QualityGroup") -> float: + from cura.CuraApplication import CuraApplication + global_stack = CuraApplication.getInstance().getMachineManager().activeMachine + + default_layer_height = global_stack.definition.getProperty("layer_height", "value") + + # Get layer_height from the quality profile for the GlobalStack + if quality_group.node_for_global is None: + return float(default_layer_height) + container = quality_group.node_for_global.container + + layer_height = default_layer_height + if container and container.hasProperty("layer_height", "value"): + layer_height = container.getProperty("layer_height", "value") + else: + # Look for layer_height in the GlobalStack from material -> definition + container = global_stack.definition + if container and container.hasProperty("layer_height", "value"): + layer_height = container.getProperty("layer_height", "value") + + if isinstance(layer_height, SettingFunction): + layer_height = layer_height(global_stack) + + return float(layer_height) diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index ab40f440ec..78e8568322 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -2,17 +2,12 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, QTimer -from typing import TYPE_CHECKING - -from UM.Logger import Logger -from UM.Qt.ListModel import ListModel -from UM.Settings.SettingFunction import SettingFunction import cura.CuraApplication # Imported this way to prevent circular dependencies. +from UM.Logger import Logger +from UM.Qt.ListModel import ListModel from cura.Machines.ContainerTree import ContainerTree - -if TYPE_CHECKING: - from cura.Machines.QualityGroup import QualityGroup +from cura.Machines.Models.MachineModelUtils import fetch_layer_height # @@ -76,6 +71,12 @@ class QualityProfilesDropDownMenuModel(ListModel): Logger.log("d", "No active GlobalStack, set quality profile model as empty.") return + if not self._layer_height_unit: + unit = global_stack.definition.getProperty("layer_height", "unit") + if not unit: + unit = "" + self._layer_height_unit = unit + # Check for material compatibility if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): Logger.log("d", "No active material compatibility, set quality profile model as empty.") @@ -86,7 +87,7 @@ class QualityProfilesDropDownMenuModel(ListModel): item_list = [] for quality_group in quality_group_dict.values(): - layer_height = self._fetchLayerHeight(quality_group) + layer_height = fetch_layer_height(quality_group) item = {"name": quality_group.name, "quality_type": quality_group.quality_type, @@ -102,32 +103,3 @@ class QualityProfilesDropDownMenuModel(ListModel): item_list = sorted(item_list, key = lambda x: x["layer_height"]) self.setItems(item_list) - - def _fetchLayerHeight(self, quality_group: "QualityGroup") -> float: - global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine - if not self._layer_height_unit: - unit = global_stack.definition.getProperty("layer_height", "unit") - if not unit: - unit = "" - self._layer_height_unit = unit - - default_layer_height = global_stack.definition.getProperty("layer_height", "value") - - # Get layer_height from the quality profile for the GlobalStack - if quality_group.node_for_global is None: - return float(default_layer_height) - container = quality_group.node_for_global.container - - layer_height = default_layer_height - if container and container.hasProperty("layer_height", "value"): - layer_height = container.getProperty("layer_height", "value") - else: - # Look for layer_height in the GlobalStack from material -> definition - container = global_stack.definition - if container and container.hasProperty("layer_height", "value"): - layer_height = container.getProperty("layer_height", "value") - - if isinstance(layer_height, SettingFunction): - layer_height = layer_height(global_stack) - - return float(layer_height) From 85ed22de4c684e1850692a2dbe912984f1192b85 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 4 Oct 2019 13:29:22 +0200 Subject: [PATCH 562/994] Add some profiling decorators to the ContainerTree --- cura/Machines/ContainerTree.py | 3 +++ cura/Machines/IntentNode.py | 1 + cura/Machines/MachineNode.py | 2 ++ cura/Machines/MaterialNode.py | 3 ++- cura/Machines/QualityNode.py | 4 +++- cura/Machines/VariantNode.py | 5 ++++- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index ce4c43e1d3..50ccc893a9 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -11,11 +11,13 @@ from cura.Settings.GlobalStack import GlobalStack # To listen only to global st from typing import Dict, List, TYPE_CHECKING import time +import UM.FlameProfiler if TYPE_CHECKING: from cura.Machines.QualityGroup import QualityGroup from cura.Machines.QualityChangesGroup import QualityChangesGroup + ## This class contains a look-up tree for which containers are available at # which stages of configuration. # @@ -77,6 +79,7 @@ class ContainerTree: # Add a machine node by the id of it's definition. # This is automatically called by the _machineAdded function, but it's sometimes needed to add a machine node # faster than would have been done when waiting on any signals (for instance; when creating an entirely new machine) + @UM.FlameProfiler.profile def addMachineNodeByDefinitionId(self, definition_id: str) -> None: if definition_id in self.machines: return # Already have this definition ID. diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index dbf37a341a..2b3a596f81 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -10,6 +10,7 @@ from cura.Machines.ContainerNode import ContainerNode if TYPE_CHECKING: from cura.Machines.QualityNode import QualityNode + ## This class represents an intent profile in the container tree. # # This class has no more subnodes. diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 83e8b053fc..0c8655070a 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -13,6 +13,7 @@ from cura.Machines.QualityChangesGroup import QualityChangesGroup # To construc from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode +import UM.FlameProfiler ## This class represents a machine in the container tree. @@ -168,6 +169,7 @@ class MachineNode(ContainerNode): return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) ## (Re)loads all variants under this printer. + @UM.FlameProfiler.profile def _loadAll(self): container_registry = ContainerRegistry.getInstance() if not self.has_variants: diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 2ea0cd12b5..fe20af2cd5 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -9,7 +9,7 @@ from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode - +import UM.FlameProfiler if TYPE_CHECKING: from typing import Dict from cura.Machines.VariantNode import VariantNode @@ -55,6 +55,7 @@ class MaterialNode(ContainerNode): )) return fallback + @UM.FlameProfiler.profile def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() # Find all quality profiles that fit on this material. diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 66919d1c07..45cd898db5 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -6,12 +6,13 @@ from typing import Union, TYPE_CHECKING from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Machines.ContainerNode import ContainerNode from cura.Machines.IntentNode import IntentNode - +import UM.FlameProfiler if TYPE_CHECKING: from typing import Dict from cura.Machines.MaterialNode import MaterialNode from cura.Machines.MachineNode import MachineNode + ## Represents a quality profile in the container tree. # # This may either be a normal quality profile or a global quality profile. @@ -29,6 +30,7 @@ class QualityNode(ContainerNode): self._material = my_metadata.get("material") self._loadAll() + @UM.FlameProfiler.profile def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index c8593f9eba..d34580d465 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -9,7 +9,7 @@ from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode - +import UM.FlameProfiler if TYPE_CHECKING: from typing import Dict from cura.Machines.MachineNode import MachineNode @@ -38,6 +38,7 @@ class VariantNode(ContainerNode): self._loadAll() ## (Re)loads all materials under this variant. + @UM.FlameProfiler.profile def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() @@ -92,6 +93,7 @@ class VariantNode(ContainerNode): ## When a material gets added to the set of profiles, we need to update our # tree here. + @UM.FlameProfiler.profile def _materialAdded(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "material": return # Not interested. @@ -125,6 +127,7 @@ class VariantNode(ContainerNode): self.materials[base_file].materialChanged.connect(self.materialsChanged) self.materialsChanged.emit(self.materials[base_file]) + @UM.FlameProfiler.profile def _materialRemoved(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "material": return # Only interested in materials. From 8d223c01d4239d212a06a3633c39bbc2065b9903 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 4 Oct 2019 14:07:57 +0200 Subject: [PATCH 563/994] Add type annotation for layer_heights_added CURA-6840 --- cura/Machines/Models/IntentModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 1daa1096e0..28713f0c00 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -65,7 +65,7 @@ class IntentModel(ListModel): material_nodes = self._get_active_materials() - layer_heights_added = [] + layer_heights_added = [] # type: List[float] for material_node in material_nodes: intents = self._get_intents_for_material(material_node, quality_groups) From c528000268c7553b0d3d93176875ac34f74c9d76 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 14:25:16 +0200 Subject: [PATCH 564/994] Add activeQualityDisplayName to remove code duplication CURA-6846 --- cura/Settings/MachineManager.py | 46 +++++++++++++++---- .../Custom/CustomPrintSetup.qml | 12 +---- .../PrintSetupSelectorHeader.qml | 12 +---- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 49405156e5..06f4e9be4e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -123,6 +123,14 @@ class MachineManager(QObject): self.globalContainerChanged.connect(self.printerConnectedStatusChanged) self.outputDevicesChanged.connect(self.printerConnectedStatusChanged) + # For updating active quality display name + self.activeQualityChanged.connect(self.activeQualityDisplayNameChanged) + self.activeIntentChanged.connect(self.activeQualityDisplayNameChanged) + self.activeQualityGroupChanged.connect(self.activeQualityDisplayNameChanged) + self.activeQualityChangesGroupChanged.connect(self.activeQualityDisplayNameChanged) + + activeQualityDisplayNameChanged = pyqtSignal() + activeQualityGroupChanged = pyqtSignal() activeQualityChangesGroupChanged = pyqtSignal() @@ -629,16 +637,6 @@ class MachineManager(QObject): intent_category = category return intent_category - # Returns the human-readable name of the active intent category. If the intent category is "default", returns an - # empty string. - @pyqtProperty(str, notify = activeIntentChanged) - def activeIntentName(self) -> str: - intent_category = self.activeIntentCategory - if intent_category == "default": - intent_category = "" - intent_name = intent_category.capitalize() - return intent_name - # Provies a list of extruder positions that have a different intent from the active one. @pyqtProperty("QStringList", notify=activeIntentChanged) def extruderPositionsWithNonActiveIntent(self): @@ -1591,6 +1589,34 @@ class MachineManager(QObject): if not no_dialog and self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() + # The display name of currently active quality. + # This display name is: + # - For built-in qualities (quality/intent): the quality type name, such as "Fine", "Normal", etc. + # - For custom qualities: - - + # Examples: + # - "my_profile - Fine" (only based on a default quality, no intent involved) + # - "my_profile - Engineering - Fine" (based on an intent) + @pyqtProperty(str, notify = activeQualityDisplayNameChanged) + def activeQualityDisplayName(self) -> str: + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return "" + + # Not a custom quality + display_name = self.activeQualityOrQualityChangesName + if global_stack.qualityChanges == empty_quality_changes_container: + return display_name + + # A custom quality + intent_category = self.activeIntentCategory + if intent_category != "default": + from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel + intent_display_name = IntentCategoryModel.name_translation.get(intent_category, catalog.i18nc("@label", "Unknown")) + display_name += " - {intent_name}".format(intent_name = intent_display_name) + + display_name += " - {quality_level_name}".format(quality_level_name = global_stack.quality.getName()) + return display_name + ## Change the intent category of the current printer. # # All extruders can change their profiles. If an intent profile is diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index cae34dc5c5..a297b0a769 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -100,17 +100,7 @@ Item function generateActiveQualityText() { - var result = Cura.MachineManager.activeQualityOrQualityChangesName - - // If this is a custom quality, add intent (if present) and quality it is based on - if (Cura.MachineManager.isActiveQualityCustom) - { - if (Cura.MachineManager.activeIntentName != "") - { - result += " - " + Cura.MachineManager.activeIntentName - } - result += " - " + Cura.MachineManager.activeQualityGroup.getName() - } + var result = Cura.MachineManager.activeQualityDisplayName if (Cura.MachineManager.isActiveQualityExperimental) { diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index affe514bd8..bb3a986929 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -20,17 +20,7 @@ RowLayout { if (Cura.MachineManager.activeStack) { - var text = Cura.MachineManager.activeQualityOrQualityChangesName - - // If this is a custom quality, add intent (if present) and quality it is based on - if (Cura.MachineManager.isActiveQualityCustom) - { - if (Cura.MachineManager.activeIntentName != "") - { - text += " - " + Cura.MachineManager.activeIntentName - } - text += " - " + Cura.MachineManager.activeQualityGroup.getName() - } + var text = Cura.MachineManager.activeQualityDisplayName if (!Cura.MachineManager.hasNotSupportedQuality) { From 1cfcbf0b53c76fa210d800e584d2bd5f51d47543 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Fri, 4 Oct 2019 15:05:52 +0200 Subject: [PATCH 565/994] Clean up intent profiles For when infill and/or wall speeds are not formula based in the underlying quality profile. --- .../um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 8 +++++--- ...m_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 10 +++++++--- ..._aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 10 +++++++--- .../um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 18 ++++++++++-------- ...m_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 10 +++++++--- ..._aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 10 +++++++--- ...um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 8 +++++--- ..._s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 10 +++++++--- ...aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 10 +++++++--- 9 files changed, 62 insertions(+), 32 deletions(-) diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index 9075315841..f627fbf74b 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -15,7 +15,8 @@ variant = AA 0.4 speed_infill = =speed_print speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 @@ -25,8 +26,9 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall jerk_layer_0 = 5 line_width = =machine_nozzle_size wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index db4a001daf..be622d6cfe 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 12ba19a5d2..352c26d312 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 5ed11ab78e..553a68201d 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -12,21 +12,23 @@ material = generic_pla variant = AA 0.4 [values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -infill_sparse_density = 15 fill_perimeter_gaps = nowhere +infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_print -speed_layer_0 = 20 wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 87da046a9f..0943bb2032 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 8175cd7c4a..053b849aff 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 40cef6653d..458b283dd8 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -15,7 +15,8 @@ variant = AA 0.4 speed_infill = =speed_print speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 @@ -25,8 +26,9 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall jerk_layer_0 = 5 line_width = =machine_nozzle_size wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 1aed2360e5..d19ad53fae 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index f2246a6d09..23d8b1e39b 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -16,14 +16,18 @@ infill_line_width = =line_width jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print -jerk_wall_0 = =jerk_print -jerk_wall_x = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 line_width = =machine_nozzle_size speed_print = 30 +speed_infill = =speed_print speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print -speed_wall_0 = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 From 4579b06f6d2ffb6129572227b27cb687661a4fef Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 15:10:42 +0200 Subject: [PATCH 566/994] Fix typing --- cura/Machines/Models/IntentModel.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 28713f0c00..25edc0a759 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -94,6 +94,9 @@ class IntentModel(ListModel): ## Get the active materials for all extruders. No duplicates will be returned def _get_active_materials(self) -> Set[MaterialNode]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + if global_stack is None: + return set() + container_tree = ContainerTree.getInstance() machine_node = container_tree.machines[global_stack.definition.getId()] nodes = set() # type: Set[MaterialNode] From 0a6842703c7fd1ce942f27fd15a1d29384122185 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 13:51:11 +0200 Subject: [PATCH 567/994] Update documentation This class no longer applies to quality changes. Quality changes groups don't exist any more. Done during Turbo Testing and Tooling. --- cura/Machines/QualityGroup.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 1ea7ef6903..b9f2451ddc 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Dict, Optional, List, Set @@ -11,19 +11,22 @@ from UM.Util import parseBool from cura.Machines.ContainerNode import ContainerNode +## A QualityGroup represents a group of quality containers that must be applied +# to each ContainerStack when it's used. # -# A QualityGroup represents a group of containers that must be applied to each ContainerStack when it's used. -# Some concrete examples are Quality and QualityChanges: when we select quality type "normal", this quality type -# must be applied to all stacks in a machine, although each stack can have different containers. Use an Ultimaker 3 -# as an example, suppose we choose quality type "normal", the actual InstanceContainers on each stack may look -# as below: -# GlobalStack ExtruderStack 1 ExtruderStack 2 -# quality container: um3_global_normal um3_aa04_pla_normal um3_aa04_abs_normal -# -# This QualityGroup is mainly used in quality and quality_changes to group the containers that can be applied to -# a machine, so when a quality/custom quality is selected, the container can be directly applied to each stack instead -# of looking them up again. +# A concrete example: When there are two extruders and the user selects the +# quality type "normal", this quality type must be applied to all stacks in a +# machine, although each stack can have different containers. So one global +# profile gets put on the global stack and one extruder profile gets put on +# each extruder stack. This quality group then contains the following +# profiles (for instance): +# GlobalStack ExtruderStack 1 ExtruderStack 2 +# quality container: um3_global_normal um3_aa04_pla_normal um3_aa04_abs_normal # +# The purpose of these quality groups is to group the containers that can be +# applied to a configuration, so that when a quality level is selected, the +# container can directly be applied to each stack instead of looking them up +# again. class QualityGroup(QObject): def __init__(self, name: str, quality_type: str, parent: Optional["QObject"] = None) -> None: From 6f2f15c74fadb2f0cf9dddf25b35dcaf7def8b5e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:10:45 +0200 Subject: [PATCH 568/994] Use pre-cached quality type from node rather than re-requesting it Minor performance increase. Done during Turbo Testing and Tooling. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 83e8b053fc..00edca2c6b 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -73,7 +73,7 @@ class MachineNode(ContainerNode): qualities_per_type_per_extruder[extruder_nr] = self.global_qualities else: # Use the actually specialised quality profiles. - qualities_per_type_per_extruder[extruder_nr] = {node.getMetaDataEntry("quality_type"): node for node in self.variants[variant_name].materials[material_base].qualities.values()} + qualities_per_type_per_extruder[extruder_nr] = {node.quality_type: node for node in self.variants[variant_name].materials[material_base].qualities.values()} # Create the quality group for each available type. quality_groups = {} From 6c0772cd4a8e8d6013edaaaa58bc250921917ca1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:12:57 +0200 Subject: [PATCH 569/994] Provide activeQualityGroupName instead of QualityGroup(QObject) We don't need to inherit from QObject if we expose the name elsewhere. This prevents having workarounds for C++ vs QML ownership, and also allows us to test this while mocking out CuraApplication. Done during Turbo Testing and Tooling. --- cura/Machines/MachineNode.py | 13 +++---------- cura/Machines/QualityGroup.py | 12 ++++++------ cura/Settings/MachineManager.py | 22 ++++++++++++++++++---- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 00edca2c6b..235574675c 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -8,6 +8,7 @@ from UM.Signal import Signal from UM.Util import parseBool from UM.Settings.ContainerRegistry import ContainerRegistry # To find all the variants for this machine. +import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityChangesGroup import QualityChangesGroup # To construct groups of quality changes profiles that belong together. from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together. @@ -81,15 +82,7 @@ class MachineNode(ContainerNode): if not global_quality_node.container: Logger.log("w", "Node {0} doesn't have a container.".format(global_quality_node.container_id)) continue - # CURA-6599 - # Same as QualityChangesGroup. - # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to - # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object - # parent to application seems to work. - from cura.CuraApplication import CuraApplication - quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), - quality_type = quality_type, - parent = CuraApplication.getInstance()) + quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): if quality_type in qualities_per_type: @@ -168,7 +161,7 @@ class MachineNode(ContainerNode): return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) ## (Re)loads all variants under this printer. - def _loadAll(self): + def _loadAll(self) -> None: container_registry = ContainerRegistry.getInstance() if not self.has_variants: self.variants["empty"] = VariantNode("empty_variant", machine = self) diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index b9f2451ddc..48047974a9 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -27,11 +27,12 @@ from cura.Machines.ContainerNode import ContainerNode # applied to a configuration, so that when a quality level is selected, the # container can directly be applied to each stack instead of looking them up # again. -class QualityGroup(QObject): - - def __init__(self, name: str, quality_type: str, parent: Optional["QObject"] = None) -> None: - super().__init__(parent) - +class QualityGroup: + ## Constructs a new group. + # \param name The user-visible name for the group. + # \param quality_type The quality level that each profile in this group + # has. + def __init__(self, name: str, quality_type: str) -> None: self.name = name self.node_for_global = None # type: Optional[ContainerNode] self.nodes_for_extruders = {} # type: Dict[int, ContainerNode] @@ -39,7 +40,6 @@ class QualityGroup(QObject): self.is_available = False self.is_experimental = False - @pyqtSlot(result = str) def getName(self) -> str: return self.name diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 06f4e9be4e..d315f2fdb0 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -613,9 +613,10 @@ class MachineManager(QObject): global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: return False - if not self.activeQualityGroup: + active_quality_group = self.activeQualityGroup() + if active_quality_group is None: return False - return self.activeQualityGroup.is_available + return active_quality_group.is_available @pyqtProperty(bool, notify = activeQualityGroupChanged) def isActiveQualityExperimental(self) -> bool: @@ -1646,13 +1647,26 @@ class MachineManager(QObject): else: # No intent had the correct category. extruder.intent = empty_intent_container - @pyqtProperty(QObject, fset = setQualityGroup, notify = activeQualityGroupChanged) + ## Get the currently activated quality group. + # + # If no printer is added yet or the printer doesn't have quality profiles, + # this returns ``None``. + # \return The currently active quality group. def activeQualityGroup(self) -> Optional["QualityGroup"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack or global_stack.quality == empty_quality_container: return None return ContainerTree.getInstance().getCurrentQualityGroups().get(self.activeQualityType) + ## Get the name of the active quality group. + # \return The name of the active quality group. + @pyqtProperty(str, notify = activeQualityGroupChanged) + def activeQualityGroupName(self) -> str: + quality_group = self.activeQualityGroup() + if quality_group is None: + return "" + return quality_group.getName() + @pyqtSlot(QObject) def setQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", no_dialog: bool = False) -> None: self.blurSettings.emit() @@ -1668,7 +1682,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): - self._setQualityGroup(self.activeQualityGroup) + self._setQualityGroup(self.activeQualityGroup()) for stack in [self._global_container_stack] + list(self._global_container_stack.extruders.values()): stack.userChanges.clear() From faa32ed33e030ab29d389c14d9c26ec0fa5e9cb3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:16:48 +0200 Subject: [PATCH 570/994] Remove another workaround in construction of QualityGroup Like the previous commit. Done during Turbo Testing and Tooling. --- cura/Machines/QualityManager.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 113253f822..4aa88d6775 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -111,14 +111,7 @@ class QualityManager(QObject): quality_group_dict = dict() for node in nodes_to_check: if node and node.quality_type: - # CURA-6599 - # Same as QualityChangesGroup. - # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to - # a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object - # parent to application seems to work. - from cura.CuraApplication import CuraApplication - quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type, - parent = CuraApplication.getInstance()) + quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type) quality_group.setGlobalNode(node) quality_group_dict[node.quality_type] = quality_group From 05801bb623ef94a297a7891c00739cec89fd5763 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:26:44 +0200 Subject: [PATCH 571/994] Directly ask metadata from node instead of container We only need the metadata, so far. Found with a test that got broken because I wasn't mocking out the entire container. Done during Turbo Testing and Tooling. --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 235574675c..320387659f 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -82,7 +82,7 @@ class MachineNode(ContainerNode): if not global_quality_node.container: Logger.log("w", "Node {0} doesn't have a container.".format(global_quality_node.container_id)) continue - quality_groups[quality_type] = QualityGroup(name = global_quality_node.container.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) + quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): if quality_type in qualities_per_type: From 5ae248341b5e3f95d3e4d05a769bdbbc00d761fd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:27:24 +0200 Subject: [PATCH 572/994] Add test for getting quality groups from the container tree Finally it works. Done during turbo testing and tooling. --- tests/Machines/TestMachineNode.py | 54 +++++++++++++++++++++++++- tests/Settings/TestCuraStackBuilder.py | 4 +- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index 270c2503e6..347059adb9 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -60,4 +60,56 @@ def test_metadataProperties(container_registry): assert node.exclude_materials == metadata_dict["exclude_materials"] assert node.preferred_variant_name == metadata_dict["preferred_variant_name"] assert node.preferred_material == metadata_dict["preferred_material"] - assert node.preferred_quality_type == metadata_dict["preferred_quality_type"] \ No newline at end of file + assert node.preferred_quality_type == metadata_dict["preferred_quality_type"] + +## Test getting quality groups when there are quality profiles available for +# the requested configurations on two extruders. +def test_getQualityGroupsBothExtrudersAvailable(): + # Create a machine node without constructing the tree beneath it. We don't want to depend on that for this test. + empty_container_registry = MagicMock() + empty_container_registry.findContainersMetadata = MagicMock(return_value = [metadata_dict]) # Still contain the MachineNode's own metadata for the constructor. + empty_container_registry.findInstanceContainersMetadata = MagicMock(return_value = []) + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = empty_container_registry)): + with patch("cura.Machines.MachineNode.MachineNode._loadAll", MagicMock()): + machine_node = MachineNode("machine_1") + + # Prepare a tree inside the machine node. + extruder_0_node = MagicMock(quality_type = "quality_type_1") + extruder_1_node = MagicMock(quality_type = "quality_type_1") # Same quality type, so this is the one that can be returned. + machine_node.variants = { + "variant_1": MagicMock( + materials = { + "material_1": MagicMock( + qualities = { + "quality_1": extruder_0_node + } + ) + } + ), + "variant_2": MagicMock( + materials = { + "material_2": MagicMock( + qualities = { + "quality_2": extruder_1_node + } + ) + } + ) + } + global_node = MagicMock( + container = MagicMock(id = "global_quality_container"), # Needs to exist, otherwise it won't add this quality type. + getMetaDataEntry = lambda _, __: "Global Quality Profile Name" + ) + machine_node.global_qualities = { + "quality_type_1": global_node + } + + # Request the quality groups for the variants in the machine tree. + result = machine_node.getQualityGroups(["variant_1", "variant_2"], ["material_1", "material_2"], [True, True]) + + assert "quality_type_1" in result, "This quality type was available for both extruders." + assert result["quality_type_1"].node_for_global == global_node + assert result["quality_type_1"].nodes_for_extruders[0] == extruder_0_node + assert result["quality_type_1"].nodes_for_extruders[1] == extruder_1_node + assert result["quality_type_1"].name == global_node.getMetaDataEntry("name", "Unnamed Profile") + assert result["quality_type_1"].quality_type == "quality_type_1" \ No newline at end of file diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index cf4496d0a9..aebde3406f 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -56,7 +56,7 @@ def test_createMachine(application, container_registry, definition_container, gl quality_container, intent_container, quality_changes_container): variant_manager = MagicMock(name = "Variant Manager") quality_manager = MagicMock(name = "Quality Manager") - global_variant_node = MagicMock( name = "global variant node") + global_variant_node = MagicMock(name = "global variant node") global_variant_node.container = global_variant variant_manager.getDefaultVariantNode = MagicMock(return_value = global_variant_node) @@ -98,7 +98,7 @@ def test_createExtruderStack(application, definition_container, global_variant, application.empty_quality_container = quality_container application.empty_intent_container = intent_container application.empty_quality_changes_container = quality_changes_container - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): extruder_stack = CuraStackBuilder.createExtruderStack("Whatever", definition_container, "meh", 0, global_variant, material_instance_container, quality_container) assert extruder_stack.variant == global_variant assert extruder_stack.material == material_instance_container From 2671f12c21e2f7824e6f11c51dad7bed64ef2130 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 14:46:15 +0200 Subject: [PATCH 573/994] Add test for is_available on resulting quality groups Done during Turbo Testing and Tooling. --- tests/Machines/TestMachineNode.py | 82 ++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index 347059adb9..8a343c4fe8 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -23,6 +23,18 @@ def container_registry(): result.findContainersMetadata = MagicMock(return_value = [metadata_dict]) return result +## Creates a machine node without anything underneath it. No sub-nodes. +# +# For testing stuff with machine nodes without testing _loadAll(). You'll need +# to add subnodes manually in your test. +@pytest.fixture +def empty_machine_node(): + empty_container_registry = MagicMock() + empty_container_registry.findContainersMetadata = MagicMock(return_value = [metadata_dict]) # Still contain the MachineNode's own metadata for the constructor. + empty_container_registry.findInstanceContainersMetadata = MagicMock(return_value = []) + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = empty_container_registry)): + with patch("cura.Machines.MachineNode.MachineNode._loadAll", MagicMock()): + return MachineNode("machine_1") def getMetadataEntrySideEffect(*args, **kwargs): return metadata_dict.get(args[0]) @@ -64,19 +76,11 @@ def test_metadataProperties(container_registry): ## Test getting quality groups when there are quality profiles available for # the requested configurations on two extruders. -def test_getQualityGroupsBothExtrudersAvailable(): - # Create a machine node without constructing the tree beneath it. We don't want to depend on that for this test. - empty_container_registry = MagicMock() - empty_container_registry.findContainersMetadata = MagicMock(return_value = [metadata_dict]) # Still contain the MachineNode's own metadata for the constructor. - empty_container_registry.findInstanceContainersMetadata = MagicMock(return_value = []) - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = empty_container_registry)): - with patch("cura.Machines.MachineNode.MachineNode._loadAll", MagicMock()): - machine_node = MachineNode("machine_1") - +def test_getQualityGroupsBothExtrudersAvailable(empty_machine_node): # Prepare a tree inside the machine node. extruder_0_node = MagicMock(quality_type = "quality_type_1") extruder_1_node = MagicMock(quality_type = "quality_type_1") # Same quality type, so this is the one that can be returned. - machine_node.variants = { + empty_machine_node.variants = { "variant_1": MagicMock( materials = { "material_1": MagicMock( @@ -100,16 +104,68 @@ def test_getQualityGroupsBothExtrudersAvailable(): container = MagicMock(id = "global_quality_container"), # Needs to exist, otherwise it won't add this quality type. getMetaDataEntry = lambda _, __: "Global Quality Profile Name" ) - machine_node.global_qualities = { + empty_machine_node.global_qualities = { "quality_type_1": global_node } # Request the quality groups for the variants in the machine tree. - result = machine_node.getQualityGroups(["variant_1", "variant_2"], ["material_1", "material_2"], [True, True]) + result = empty_machine_node.getQualityGroups(["variant_1", "variant_2"], ["material_1", "material_2"], [True, True]) assert "quality_type_1" in result, "This quality type was available for both extruders." assert result["quality_type_1"].node_for_global == global_node assert result["quality_type_1"].nodes_for_extruders[0] == extruder_0_node assert result["quality_type_1"].nodes_for_extruders[1] == extruder_1_node assert result["quality_type_1"].name == global_node.getMetaDataEntry("name", "Unnamed Profile") - assert result["quality_type_1"].quality_type == "quality_type_1" \ No newline at end of file + assert result["quality_type_1"].quality_type == "quality_type_1" + +## Test the "is_available" flag on quality groups. +# +# If a profile is available for a quality type on an extruder but not on all +# extruders, there should be a quality group for it but it should not be made +# available. +def test_getQualityGroupsAvailability(empty_machine_node): + # Prepare a tree inside the machine node. + extruder_0_both = MagicMock(quality_type = "quality_type_both") # This quality type is available for both extruders. + extruder_1_both = MagicMock(quality_type = "quality_type_both") + extruder_0_exclusive = MagicMock(quality_type = "quality_type_0") # These quality types are only available on one of the extruders. + extruder_1_exclusive = MagicMock(quality_type = "quality_type_1") + empty_machine_node.variants = { + "variant_1": MagicMock( + materials = { + "material_1": MagicMock( + qualities = { + "quality_0_both": extruder_0_both, + "quality_0_exclusive": extruder_0_exclusive + } + ) + } + ), + "variant_2": MagicMock( + materials = { + "material_2": MagicMock( + qualities = { + "quality_1_both": extruder_1_both, + "quality_1_exclusive": extruder_1_exclusive + } + ) + } + ) + } + global_both = MagicMock(container = MagicMock(id = "global_quality_both"), getMetaDataEntry = lambda _, __: "Global Quality Both") + global_0 = MagicMock(container = MagicMock(id = "global_quality_0"), getMetaDataEntry = lambda _, __: "Global Quality 0 Exclusive") + global_1 = MagicMock(container = MagicMock(id = "global_quality_1"), getMetaDataEntry = lambda _, __: "Global Quality 1 Exclusive") + empty_machine_node.global_qualities = { + "quality_type_both": global_both, + "quality_type_0": global_0, + "quality_type_1": global_1 + } + + # Request the quality groups for the variants in the machine tree. + result = empty_machine_node.getQualityGroups(["variant_1", "variant_2"], ["material_1", "material_2"], [True, True]) + + assert "quality_type_both" in result, "This quality type was available on both extruders." + assert result["quality_type_both"].is_available, "This quality type was available on both extruders and thus should be made available." + assert "quality_type_0" in result, "This quality type was available for one of the extruders, and so there must be a group for it (even though it's unavailable)." + assert not result["quality_type_0"].is_available, "This quality type was only available for one of the extruders and thus can't be activated." + assert "quality_type_1" in result, "This quality type was available for one of the extruders, and so there must be a group for it (even though it's unavailable)." + assert not result["quality_type_1"].is_available, "This quality type was only available for one of the extruders and thus can't be activated." \ No newline at end of file From e5c0812acc539d29589346db16c1df12bc935544 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 16:22:15 +0200 Subject: [PATCH 574/994] Fix scrolling through profiles on Qt5.12+ Contributes to issue CURA-6843. --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 78925028a1..c9686a1519 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -44,7 +44,7 @@ Popup ScrollView { property real maximumHeight: screenScaleFactor * 400 - + contentHeight: dataColumn.height height: Math.min(contentHeight, maximumHeight) clip: true @@ -52,6 +52,7 @@ Popup Column { + id: dataColumn width: parent.width Repeater { From a117e937b905dd62fbf0d17d3b709e584c43667b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:07:45 +0200 Subject: [PATCH 575/994] Add test for preferred material with the happy flow The exact preferred material is available. Pick that. --- tests/Machines/TestContainerTree.py | 3 +++ tests/Machines/TestMachineNode.py | 3 +++ tests/Machines/TestMaterialNode.py | 3 +++ tests/Machines/TestVariantNode.py | 21 ++++++++++++++++++++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index a60036b33a..6458f0f429 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import patch, MagicMock import pytest from UM.Settings.DefinitionContainer import DefinitionContainer diff --git a/tests/Machines/TestMachineNode.py b/tests/Machines/TestMachineNode.py index 8a343c4fe8..50d7bdafa0 100644 --- a/tests/Machines/TestMachineNode.py +++ b/tests/Machines/TestMachineNode.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import patch, MagicMock import pytest diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index f7e47aa634..a04c8b253b 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import patch, MagicMock import pytest diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 954904908b..1af5d274f9 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import patch, MagicMock import pytest @@ -101,7 +104,7 @@ def test_materialAdded_update(container_registry, machine_node, metadata, change variant_node = createVariantNode("machine_1", machine_node, container_registry) original_material_nodes = copy.copy(variant_node.materials) - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. with patch.dict(metadata_dict, metadata): mocked_container = createMockedInstanceContainer() @@ -113,3 +116,19 @@ def test_materialAdded_update(container_registry, machine_node, metadata, change for key in changed_material_list: assert original_material_nodes[key] != variant_node.materials[key] +def test_preferredMaterialExactMatch(): + container_registry = MagicMock( + findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) + ) + machine_node = MagicMock(preferred_material = "preferred_material_base_file") + + # Construct our own variant node with certain materials available. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): + variant_node = VariantNode("test_variant", machine_node) + variant_node.materials = { + "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), + "preferred_material_base_file": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. + } + + assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." \ No newline at end of file From 54fcb38fe60afe3fa21f14ef4746d0fe597091b8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:11:32 +0200 Subject: [PATCH 576/994] Add test for preferred material matching on submaterials Done during Turbo Testing and Tooling. --- tests/Machines/TestVariantNode.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 1af5d274f9..d7ee822ea3 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -116,6 +116,8 @@ def test_materialAdded_update(container_registry, machine_node, metadata, change for key in changed_material_list: assert original_material_nodes[key] != variant_node.materials[key] +## Tests the preferred material when the exact base file is available in the +# materials list for this node. def test_preferredMaterialExactMatch(): container_registry = MagicMock( findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) @@ -131,4 +133,23 @@ def test_preferredMaterialExactMatch(): "preferred_material_base_file": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. } - assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." \ No newline at end of file + assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." + +## Tests the preferred material when a submaterial is available in the +# materials list for this node. +def test_preferredMaterialSubmaterial(): + container_registry = MagicMock( + findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) + ) + machine_node = MagicMock(preferred_material = "preferred_material_base_file") + + # Construct our own variant node with certain materials available. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): + variant_node = VariantNode("test_variant", machine_node) + variant_node.materials = { + "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), + "preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material. + } + + assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file_aa04"], "It should match exactly on this one since it's the preferred material." \ No newline at end of file From 30e268e975753a97997f17a9186ad57c24d9ea9c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:16:59 +0200 Subject: [PATCH 577/994] Add test for preferred material's diameter check Done during Turbo Testing and Tooling. --- tests/Machines/TestVariantNode.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index d7ee822ea3..5321429c20 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -152,4 +152,25 @@ def test_preferredMaterialSubmaterial(): "preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material. } - assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file_aa04"], "It should match exactly on this one since it's the preferred material." \ No newline at end of file + assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well." + +## Tests the preferred material matching on the approximate diameter of the +# filament. +def test_preferredMaterialDiameter(): + container_registry = MagicMock( + findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) + ) + machine_node = MagicMock(preferred_material = "preferred") + + # Construct our own variant node with certain materials available. + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): + variant_node = VariantNode("test_variant", machine_node) + + variant_node.materials = { + "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), + "preferred_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3. + "preferred_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. + } + + assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_correct_diameter"], "It should match only on the material with correct diameter." \ No newline at end of file From 93e397a0cc0c8216d445c2a81502a07ef97ae8ec Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:23:14 +0200 Subject: [PATCH 578/994] Move creation of empty variant nodes to fixture Done during Turbo Testing and Tooling. --- tests/Machines/TestVariantNode.py | 64 ++++++++++++------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 5321429c20..e17685c30b 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -45,8 +45,22 @@ def getInstanceContainerSideEffect(*args, **kwargs): def machine_node(): mocked_machine_node = MagicMock() mocked_machine_node.container_id = "machine_1" + mocked_machine_node.preferred_material = "preferred_material" return mocked_machine_node +## Constructs a variant node without any subnodes. +# +# This is useful for performing tests on VariantNode without being dependent +# on how _loadAll works. +@pytest.fixture +def empty_variant_node(machine_node): + container_registry = MagicMock( + findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) + ) + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): + result = VariantNode("test_variant", machine = machine_node) + return result @pytest.fixture def container_registry(): @@ -118,59 +132,31 @@ def test_materialAdded_update(container_registry, machine_node, metadata, change ## Tests the preferred material when the exact base file is available in the # materials list for this node. -def test_preferredMaterialExactMatch(): - container_registry = MagicMock( - findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) - ) - machine_node = MagicMock(preferred_material = "preferred_material_base_file") - - # Construct our own variant node with certain materials available. - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): - variant_node = VariantNode("test_variant", machine_node) - variant_node.materials = { +def test_preferredMaterialExactMatch(empty_variant_node): + empty_variant_node.materials = { "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), "preferred_material_base_file": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. } - assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." ## Tests the preferred material when a submaterial is available in the # materials list for this node. -def test_preferredMaterialSubmaterial(): - container_registry = MagicMock( - findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) - ) - machine_node = MagicMock(preferred_material = "preferred_material_base_file") - - # Construct our own variant node with certain materials available. - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): - variant_node = VariantNode("test_variant", machine_node) - variant_node.materials = { +def test_preferredMaterialSubmaterial(empty_variant_node): + empty_variant_node.materials = { "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), "preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material. } - assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well." + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well." ## Tests the preferred material matching on the approximate diameter of the # filament. -def test_preferredMaterialDiameter(): - container_registry = MagicMock( - findContainersMetadata = MagicMock(return_value = [{"name": "test variant name"}]) - ) - machine_node = MagicMock(preferred_material = "preferred") - - # Construct our own variant node with certain materials available. - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - with patch("cura.Machines.VariantNode.VariantNode._loadAll", MagicMock()): - variant_node = VariantNode("test_variant", machine_node) - - variant_node.materials = { +def test_preferredMaterialDiameter(empty_variant_node): + empty_variant_node.materials = { "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), - "preferred_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3. - "preferred_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. + "preferred_material_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3. + "preferred_material_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. } - assert variant_node.preferredMaterial(approximate_diameter = 3) == variant_node.materials["preferred_correct_diameter"], "It should match only on the material with correct diameter." \ No newline at end of file + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." \ No newline at end of file From 9b6443c2d39ae4b750d325b3cc610799b9b0103f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:28:27 +0200 Subject: [PATCH 579/994] Add test for preferred material diameter mismatch Done during Turbo Testing and Tooling. --- tests/Machines/TestVariantNode.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index e17685c30b..8195d5cf5d 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -1,6 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import collections # For OrderedDict to ensure that the first iteration of preferred material is dependable. from unittest.mock import patch, MagicMock import pytest @@ -159,4 +160,11 @@ def test_preferredMaterialDiameter(empty_variant_node): "preferred_material_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. } - assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." \ No newline at end of file + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." + +def test_preferredMaterialDiameterNoMatch(empty_variant_node): + empty_variant_node.materials = collections.OrderedDict() + empty_variant_node.materials["some_different_material"] = MagicMock(getMetaDataEntry = lambda x: 3) # This one first so that it gets iterated over first. + empty_variant_node.materials["preferred_material_wrong_diameter"] = MagicMock(getMetaDataEntry = lambda x: 2) + + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["some_different_material"], "It should match on another material with the correct diameter if the preferred one is unavailable." \ No newline at end of file From 862504f603a53d2fff3f9f689742d1aa38d5ba20 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:32:42 +0200 Subject: [PATCH 580/994] Add test for preferring a material diameter over the preferred from metadata Done during Turbo Testing and Tooling. --- tests/Machines/TestVariantNode.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 8195d5cf5d..71257bd972 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -162,9 +162,21 @@ def test_preferredMaterialDiameter(empty_variant_node): assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." +## Tests the preferred material matching on a different material if the +# diameter is wrong. def test_preferredMaterialDiameterNoMatch(empty_variant_node): empty_variant_node.materials = collections.OrderedDict() empty_variant_node.materials["some_different_material"] = MagicMock(getMetaDataEntry = lambda x: 3) # This one first so that it gets iterated over first. empty_variant_node.materials["preferred_material_wrong_diameter"] = MagicMock(getMetaDataEntry = lambda x: 2) - assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["some_different_material"], "It should match on another material with the correct diameter if the preferred one is unavailable." \ No newline at end of file + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["some_different_material"], "It should match on another material with the correct diameter if the preferred one is unavailable." + +## Tests that the material diameter is considered more important to match than +# the preferred diameter. +def test_preferredMaterialDiameterPreference(empty_variant_node): + empty_variant_node.materials = collections.OrderedDict() + empty_variant_node.materials["some_different_material"] = MagicMock(getMetaDataEntry = lambda x: 2) # This one first so that it gets iterated over first. + empty_variant_node.materials["preferred_material_wrong_diameter"] = MagicMock(getMetaDataEntry = lambda x: 2) # Matches on ID but not diameter. + empty_variant_node.materials["not_preferred_but_correct_diameter"] = MagicMock(getMetaDataEntry = lambda x: 3) # Matches diameter but not ID. + + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["not_preferred_but_correct_diameter"], "It should match on the correct diameter even if it's not the preferred one." \ No newline at end of file From 54c1980f782b1e38d24fcd09ff8e6bdb9bd585d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Oct 2019 17:35:38 +0200 Subject: [PATCH 581/994] Fix preferring correct diameter over correct preference If the diameter doesn't match up, then the print fails. If the preference is not held up, then it chooses some random material and the user will understand what it chose. Done during Turbo Testing and Tooling because a test was failing. --- cura/Machines/VariantNode.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index d34580d465..fa0c61bd3d 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -82,6 +82,10 @@ class VariantNode(ContainerNode): for base_material, material_node in self.materials.items(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node + # First fallback: Choose any material with matching diameter. + for material_node in self.materials.values(): + if approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + return material_node fallback = next(iter(self.materials.values())) # Should only happen with empty material node. Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format( preferred_material = self.machine.preferred_material, From 1967dd840407046668848cd2bb7a7273d0755b53 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 08:12:48 +0200 Subject: [PATCH 582/994] Fix code style CURA-6840 --- cura/Machines/Models/IntentModel.py | 14 +++++++------- cura/Machines/Models/MachineModelUtils.py | 6 +++++- .../Models/QualityProfilesDropDownMenuModel.py | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 25edc0a759..4e96d8e152 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -9,7 +9,7 @@ from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MaterialNode import MaterialNode -from cura.Machines.Models.MachineModelUtils import fetch_layer_height +from cura.Machines.Models.MachineModelUtils import fetchLayerHeight from cura.Machines.QualityGroup import QualityGroup @@ -63,12 +63,12 @@ class IntentModel(ListModel): return quality_groups = ContainerTree.getInstance().getCurrentQualityGroups() - material_nodes = self._get_active_materials() + material_nodes = self._getActiveMaterials() layer_heights_added = [] # type: List[float] for material_node in material_nodes: - intents = self._get_intents_for_material(material_node, quality_groups) + intents = self._getIntentsForMaterial(material_node, quality_groups) for intent in intents: if intent["layer_height"] not in layer_heights_added: new_items.append(intent) @@ -79,7 +79,7 @@ class IntentModel(ListModel): for quality_tuple, quality_group in quality_groups.items(): # Add the intents that are of the correct category if quality_tuple[0] != self._intent_category: - layer_height = fetch_layer_height(quality_group) + layer_height = fetchLayerHeight(quality_group) if layer_height not in layer_heights_added: new_items.append({"name": "Unavailable", "quality_type": "", @@ -92,7 +92,7 @@ class IntentModel(ListModel): self.setItems(new_items) ## Get the active materials for all extruders. No duplicates will be returned - def _get_active_materials(self) -> Set[MaterialNode]: + def _getActiveMaterials(self) -> Set["MaterialNode"]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: return set() @@ -109,14 +109,14 @@ class IntentModel(ListModel): return nodes - def _get_intents_for_material(self, active_material_node: MaterialNode, quality_groups: Dict[str, QualityGroup]) -> List[Dict[str, Any]]: + def _getIntentsForMaterial(self, active_material_node: "MaterialNode", quality_groups: Dict[str, "QualityGroup"]) -> List[Dict[str, Any]]: extruder_intents = [] # type: List[Dict[str, Any]] for quality_id, quality_node in active_material_node.qualities.items(): if quality_node.quality_type not in quality_groups: # Don't add the empty quality type (or anything else that would crash, defensively). continue quality_group = quality_groups[quality_node.quality_type] - layer_height = fetch_layer_height(quality_group) + layer_height = fetchLayerHeight(quality_group) for intent_id, intent_node in quality_node.intents.items(): if intent_node.intent_category != self._intent_category: diff --git a/cura/Machines/Models/MachineModelUtils.py b/cura/Machines/Models/MachineModelUtils.py index 3e94f4f010..a23b1ff3a5 100644 --- a/cura/Machines/Models/MachineModelUtils.py +++ b/cura/Machines/Models/MachineModelUtils.py @@ -1,3 +1,6 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from typing import TYPE_CHECKING from UM.Settings.SettingFunction import SettingFunction @@ -7,7 +10,8 @@ if TYPE_CHECKING: layer_height_unit = "" -def fetch_layer_height(quality_group: "QualityGroup") -> float: + +def fetchLayerHeight(quality_group: "QualityGroup") -> float: from cura.CuraApplication import CuraApplication global_stack = CuraApplication.getInstance().getMachineManager().activeMachine diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 78e8568322..9bf1cc08a8 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -7,7 +7,7 @@ import cura.CuraApplication # Imported this way to prevent circular dependencie from UM.Logger import Logger from UM.Qt.ListModel import ListModel from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.Models.MachineModelUtils import fetch_layer_height +from cura.Machines.Models.MachineModelUtils import fetchLayerHeight # @@ -87,7 +87,7 @@ class QualityProfilesDropDownMenuModel(ListModel): item_list = [] for quality_group in quality_group_dict.values(): - layer_height = fetch_layer_height(quality_group) + layer_height = fetchLayerHeight(quality_group) item = {"name": quality_group.name, "quality_type": quality_group.quality_type, From c42feae11c142b724699d68ab8cf3dbe8a031c21 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 4 Oct 2019 13:36:03 +0200 Subject: [PATCH 583/994] Make intents work on quality management page CURA-6706 --- cura/Machines/Models/IntentModel.py | 26 ++----- .../Machines/Models/QualityManagementModel.py | 77 +++++++++++++++++-- cura/Settings/IntentManager.py | 4 +- cura/Settings/MachineManager.py | 2 + resources/qml/Preferences/ProfilesPage.qml | 37 ++++++--- tests/TestQualityManager.py | 8 +- 6 files changed, 114 insertions(+), 40 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 4e96d8e152..62c816f3a9 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -74,21 +74,7 @@ class IntentModel(ListModel): new_items.append(intent) layer_heights_added.append(intent["layer_height"]) - # Now that we added all intents that we found something for, ensure that we set add ticks (and layer_heights) - # for all groups that we don't have anything for (and set it to not available) - for quality_tuple, quality_group in quality_groups.items(): - # Add the intents that are of the correct category - if quality_tuple[0] != self._intent_category: - layer_height = fetchLayerHeight(quality_group) - if layer_height not in layer_heights_added: - new_items.append({"name": "Unavailable", - "quality_type": "", - "layer_height": layer_height, - "intent_category": self._intent_category, - "available": False}) - layer_heights_added.append(layer_height) - - new_items = sorted(new_items, key=lambda x: x["layer_height"]) + new_items = sorted(new_items, key = lambda x: x["layer_height"]) self.setItems(new_items) ## Get the active materials for all extruders. No duplicates will be returned @@ -122,11 +108,11 @@ class IntentModel(ListModel): if intent_node.intent_category != self._intent_category: continue extruder_intents.append({"name": quality_group.name, - "quality_type": quality_group.quality_type, - "layer_height": layer_height, - "available": quality_group.is_available, - "intent_category": self._intent_category - }) + "quality_type": quality_group.quality_type, + "layer_height": layer_height, + "available": quality_group.is_available, + "intent_category": self._intent_category + }) return extruder_intents def __repr__(self): diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index dcaa43283c..f3d977d643 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -12,6 +12,11 @@ import cura.CuraApplication # Imported this way to prevent circular imports. from cura.Settings.ContainerManager import ContainerManager from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container +from cura.Settings.IntentManager import IntentManager +from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel + +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") if TYPE_CHECKING: from UM.Settings.Interfaces import ContainerInterface @@ -19,6 +24,7 @@ if TYPE_CHECKING: from cura.Settings.ExtruderStack import ExtruderStack from cura.Settings.GlobalStack import GlobalStack + # # This the QML model for the quality management page. # @@ -26,15 +32,21 @@ class QualityManagementModel(ListModel): NameRole = Qt.UserRole + 1 IsReadOnlyRole = Qt.UserRole + 2 QualityGroupRole = Qt.UserRole + 3 - QualityChangesGroupRole = Qt.UserRole + 4 + QualityTypeRole = Qt.UserRole + 4 + QualityChangesGroupRole = Qt.UserRole + 5 + IntentCategoryRole = Qt.UserRole + 6 + SectionNameRole = Qt.UserRole + 7 - def __init__(self, parent = None): + def __init__(self, parent: Optional["QObject"] = None) -> None: super().__init__(parent) self.addRoleName(self.NameRole, "name") self.addRoleName(self.IsReadOnlyRole, "is_read_only") self.addRoleName(self.QualityGroupRole, "quality_group") + self.addRoleName(self.QualityTypeRole, "quality_type") self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group") + self.addRoleName(self.IntentCategoryRole, "intent_category") + self.addRoleName(self.SectionNameRole, "section_name") application = cura.CuraApplication.CuraApplication.getInstance() container_registry = application.getContainerRegistry() @@ -127,11 +139,13 @@ class QualityManagementModel(ListModel): container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() new_name = container_registry.uniqueName(new_name) + intent_category = quality_model_item["intent_category"] quality_group = quality_model_item["quality_group"] quality_changes_group = quality_model_item["quality_changes_group"] if quality_changes_group is None: # Create global quality changes only. - new_quality_changes = self._createQualityChanges(quality_group.quality_type, None, new_name, global_stack, extruder_stack = None) + new_quality_changes = self._createQualityChanges(quality_group.quality_type, intent_category, new_name, + global_stack, extruder_stack = None) container_registry.addContainer(new_quality_changes) else: for metadata in [quality_changes_group.metadata_for_global] + list(quality_changes_group.metadata_per_extruder.values()): @@ -233,6 +247,31 @@ class QualityManagementModel(ListModel): if container.getMetaDataEntry("type") == "quality_changes": self._update() + @pyqtSlot("QVariantMap", result = str) + def getQualityItemDisplayName(self, quality_model_item: Dict[str, Any]) -> str: + display_name = quality_model_item["name"] + + quality_group = quality_model_item["quality_group"] + is_read_only = quality_model_item["is_read_only"] + intent_category = quality_model_item["intent_category"] + + # Not a custom quality + if is_read_only: + return display_name + + # A custom quality + if intent_category != "default": + from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel + intent_display_name = IntentCategoryModel.name_translation.get(intent_category, + catalog.i18nc("@label", "Unknown")) + display_name += " - {intent_name}".format(intent_name = intent_display_name) + + quality_level_name = "Not Supported" + if quality_group is not None: + quality_level_name = quality_group.name + display_name += " - {quality_level_name}".format(quality_level_name = quality_level_name) + return display_name + def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) @@ -253,7 +292,7 @@ class QualityManagementModel(ListModel): return item_list = [] - # Create quality group items + # Create quality group items (intent category = "default") for quality_group in quality_group_dict.values(): if not quality_group.is_available: continue @@ -261,11 +300,33 @@ class QualityManagementModel(ListModel): item = {"name": quality_group.name, "is_read_only": True, "quality_group": quality_group, - "quality_changes_group": None} + "quality_type": quality_group.quality_type, + "quality_changes_group": None, + "intent_category": "default", + "section_name": catalog.i18nc("@label", "Default"), + } item_list.append(item) # Sort by quality names item_list = sorted(item_list, key = lambda x: x["name"].upper()) + # Create intent items (non-default) + available_intent_list = IntentManager.getInstance().getCurrentAvailableIntents() + available_intent_list = [i for i in available_intent_list if i[0] != "default"] + result = [] + for intent_category, quality_type in available_intent_list: + result.append({ + "name": quality_group_dict[quality_type].name, # Use the quality name as the display name + "is_read_only": True, + "quality_group": quality_group_dict[quality_type], + "quality_type": quality_type, + "quality_changes_group": None, + "intent_category": intent_category, + "section_name": IntentCategoryModel.name_translation.get(intent_category, catalog.i18nc("@label", "Unknown")), + }) + # Sort by quality_type for each intent category + result = sorted(result, key = lambda x: (x["intent_category"], x["quality_type"])) + item_list += result + # Create quality_changes group items quality_changes_item_list = [] for quality_changes_group in quality_changes_group_list: @@ -273,7 +334,11 @@ class QualityManagementModel(ListModel): item = {"name": quality_changes_group.name, "is_read_only": False, "quality_group": quality_group, - "quality_changes_group": quality_changes_group} + "quality_type": quality_group.quality_type, + "quality_changes_group": quality_changes_group, + "intent_category": quality_changes_group.intent_category, + "section_name": catalog.i18nc("@label", "Custom profiles"), + } quality_changes_item_list.append(item) # Sort quality_changes items by names and append to the item list diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 973381504d..9f9d174ffa 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -80,7 +80,7 @@ class IntentManager(QObject): for extruder_stack in global_stack.extruderList: nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") - final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata["quality_type"] in available_quality_types} + final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata.get("quality_type") in available_quality_types} result = set() # type: Set[Tuple[str, str]] for intent_id in final_intent_ids: @@ -162,4 +162,4 @@ class IntentManager(QObject): extruder_stack.intent = self.getDefaultIntent() application.getMachineManager().setQualityGroupByQualityType(quality_type) if old_intent_category != intent_category: - self.intentCategoryChanged.emit() \ No newline at end of file + self.intentCategoryChanged.emit() diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d315f2fdb0..568985acbf 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -636,6 +636,7 @@ class MachineManager(QObject): category = extruder.intent.getMetaDataEntry("intent_category", "default") if category != "default" and category != intent_category: intent_category = category + return intent_category # Provies a list of extruder positions that have a different intent from the active one. @@ -1625,6 +1626,7 @@ class MachineManager(QObject): # Otherwise the intent profile will be left to the empty profile, which # represents the "default" intent category. # \param intent_category The intent category to change to. + @pyqtSlot(str) def setIntentByCategory(self, intent_category: str) -> None: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index d620c1a37e..51fe7ac81f 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Dialogs 1.2 import UM 1.2 as UM -import Cura 1.0 as Cura +import Cura 1.6 as Cura Item @@ -43,6 +43,7 @@ Item } property var currentItemName: hasCurrentItem ? base.currentItem.name : "" + property var currentItemDisplayName: hasCurrentItem ? base.qualityManagementModel.getQualityItemDisplayName(base.currentItem) : "" property var isCurrentItemActivated: { @@ -50,7 +51,14 @@ Item { return false; } - return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName; + if (base.currentItem.is_read_only) + { + return (base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName) && (base.currentItem.intent_category == Cura.MachineManager.activeIntentCategory); + } + else + { + return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName; + } } property var canCreateProfile: @@ -80,7 +88,7 @@ Item { if (base.currentItem.is_read_only) { - Cura.MachineManager.setQualityGroup(base.currentItem.quality_group); + Cura.IntentManager.selectIntent(base.currentItem.intent_category, base.currentItem.quality_type); } else { @@ -434,7 +442,7 @@ Item } } - section.property: "is_read_only" + section.property: "section_name" section.delegate: Rectangle { height: childrenRect.height @@ -443,7 +451,7 @@ Item { anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_lining").width - text: section == "true" ? catalog.i18nc("@label", "Default profiles") : catalog.i18nc("@label", "Custom profiles") + text: section font.bold: true } } @@ -467,7 +475,19 @@ Item width: Math.floor((parent.width * 0.8)) text: model.name elide: Text.ElideRight - font.italic: model.name == Cura.MachineManager.activeQualityOrQualityChangesName + font.italic: + { + if (model.is_read_only) + { + // For built-in qualities, it needs to match both the intent category and the quality name + return model.name == Cura.MachineManager.activeQualityOrQualityChangesName && model.intent_category == Cura.MachineManager.activeIntentCategory + } + else + { + // For custom qualities, it only needs to match the name + return model.name == Cura.MachineManager.activeQualityOrQualityChangesName + } + } color: parent.isCurrentItem ? palette.highlightedText : palette.text } @@ -511,7 +531,7 @@ Item Label { - text: base.currentItemName + text: base.currentItemDisplayName font: UM.Theme.getFont("large_bold") } } @@ -519,7 +539,7 @@ Item Flow { id: currentSettingsActions - visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName + visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName && base.currentItem.intent_category == Cura.MachineManager.activeIntentCategory anchors.left: parent.left anchors.right: parent.right anchors.top: profileName.bottom @@ -567,7 +587,6 @@ Item } } - TabView { anchors.left: parent.left diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py index 52c3da4fbb..fb96f4476b 100644 --- a/tests/TestQualityManager.py +++ b/tests/TestQualityManager.py @@ -118,10 +118,12 @@ def test_duplicateQualityChanges(quality_mocked_application): quality_group.getAllNodes = MagicMock(return_value = mocked_quality) quality_changes_group = MagicMock() mocked_quality_changes = MagicMock() - quality_changes_group.getAllNodes = MagicMock(return_value=[mocked_quality_changes]) + quality_changes_group.getAllNodes = MagicMock(return_value = [mocked_quality_changes]) mocked_quality_changes.duplicate = MagicMock(return_value = mocked_quality_changes) manager._container_registry.addContainer = MagicMock() # Side effect we want to check. - manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": quality_changes_group}) - assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) \ No newline at end of file + manager.duplicateQualityChanges("zomg", {"intent_category": "default", + "quality_group": quality_group, + "quality_changes_group": quality_changes_group}) + assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) From 2033f24a175b10def1e56e40539732777ab25ab0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 12:41:49 +0200 Subject: [PATCH 584/994] Use catalog to translate intent category name CURA-6706 --- cura/Machines/Models/QualityManagementModel.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index f3d977d643..5441c73752 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -262,8 +262,7 @@ class QualityManagementModel(ListModel): # A custom quality if intent_category != "default": from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel - intent_display_name = IntentCategoryModel.name_translation.get(intent_category, - catalog.i18nc("@label", "Unknown")) + intent_display_name = catalog.i18nc("@label", intent_category.capitalize()) display_name += " - {intent_name}".format(intent_name = intent_display_name) quality_level_name = "Not Supported" @@ -321,7 +320,7 @@ class QualityManagementModel(ListModel): "quality_type": quality_type, "quality_changes_group": None, "intent_category": intent_category, - "section_name": IntentCategoryModel.name_translation.get(intent_category, catalog.i18nc("@label", "Unknown")), + "section_name": catalog.i18nc("@label", intent_category.capitalize()), }) # Sort by quality_type for each intent category result = sorted(result, key = lambda x: (x["intent_category"], x["quality_type"])) From d99386cf2e61232934bcc9bd56cebd9ca156ba1c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 12:58:38 +0200 Subject: [PATCH 585/994] Fix recommended mode CURA-6706 --- cura/Machines/Models/IntentModel.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index 62c816f3a9..f5560bc94e 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -65,14 +65,26 @@ class IntentModel(ListModel): material_nodes = self._getActiveMaterials() - layer_heights_added = [] # type: List[float] - + added_quality_type_set = set() # type: Set[str] for material_node in material_nodes: intents = self._getIntentsForMaterial(material_node, quality_groups) for intent in intents: - if intent["layer_height"] not in layer_heights_added: + if intent["quality_type"] not in added_quality_type_set: new_items.append(intent) - layer_heights_added.append(intent["layer_height"]) + added_quality_type_set.add(intent["quality_type"]) + + # Now that we added all intents that we found something for, ensure that we set add ticks (and layer_heights) + # for all groups that we don't have anything for (and set it to not available) + for quality_type, quality_group in quality_groups.items(): + # Add the intents that are of the correct category + if quality_type not in added_quality_type_set: + layer_height = fetchLayerHeight(quality_group) + new_items.append({"name": "Unavailable", + "quality_type": quality_type, + "layer_height": layer_height, + "intent_category": self._intent_category, + "available": False}) + added_quality_type_set.add(quality_type) new_items = sorted(new_items, key = lambda x: x["layer_height"]) self.setItems(new_items) From e4fa89ea4b72d25e28e2c561065e351b4c0c416e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 13:28:10 +0200 Subject: [PATCH 586/994] Simplify quality display name (label name) generation CURA-6706 --- .../Machines/Models/QualityManagementModel.py | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 5441c73752..adaa4309b7 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -13,7 +13,6 @@ from cura.Settings.ContainerManager import ContainerManager from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container from cura.Settings.IntentManager import IntentManager -from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -249,26 +248,26 @@ class QualityManagementModel(ListModel): @pyqtSlot("QVariantMap", result = str) def getQualityItemDisplayName(self, quality_model_item: Dict[str, Any]) -> str: - display_name = quality_model_item["name"] - quality_group = quality_model_item["quality_group"] is_read_only = quality_model_item["is_read_only"] intent_category = quality_model_item["intent_category"] - # Not a custom quality - if is_read_only: - return display_name - - # A custom quality - if intent_category != "default": - from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel - intent_display_name = catalog.i18nc("@label", intent_category.capitalize()) - display_name += " - {intent_name}".format(intent_name = intent_display_name) - quality_level_name = "Not Supported" if quality_group is not None: quality_level_name = quality_group.name - display_name += " - {quality_level_name}".format(quality_level_name = quality_level_name) + + display_name = quality_level_name + + if intent_category != "default": + intent_display_name = catalog.i18nc("@label", intent_category.capitalize()) + display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, + the_rest = display_name) + + # A custom quality + if not is_read_only: + display_name = "{custom_profile_name} - {the_rest}".format(custom_profile_name = quality_model_item["name"], + the_rest = display_name) + return display_name def _update(self): From 757b02ec423a62f800939c84ebefe6d2cdb4fee0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 13:28:58 +0200 Subject: [PATCH 587/994] Simply and fix quality name generation CURA-6846 --- cura/Settings/MachineManager.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d315f2fdb0..c18b76deba 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -26,6 +26,7 @@ import cura.CuraApplication # Imported like this to prevent circular references from cura.Machines.ContainerNode import ContainerNode from cura.Machines.ContainerTree import ContainerTree +from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel @@ -1603,19 +1604,19 @@ class MachineManager(QObject): if global_stack is None: return "" - # Not a custom quality - display_name = self.activeQualityOrQualityChangesName - if global_stack.qualityChanges == empty_quality_changes_container: - return display_name + display_name = global_stack.quality.getName() - # A custom quality intent_category = self.activeIntentCategory if intent_category != "default": - from cura.Machines.Models.IntentCategoryModel import IntentCategoryModel - intent_display_name = IntentCategoryModel.name_translation.get(intent_category, catalog.i18nc("@label", "Unknown")) - display_name += " - {intent_name}".format(intent_name = intent_display_name) + intent_display_name = IntentCategoryModel.name_translation.get(intent_category, + catalog.i18nc("@label", "Unknown")) + display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, + the_rest = display_name) + + # Not a custom quality + if global_stack.qualityChanges != empty_quality_changes_container: + display_name = self.activeQualityOrQualityChangesName + " - " + display_name - display_name += " - {quality_level_name}".format(quality_level_name = global_stack.quality.getName()) return display_name ## Change the intent category of the current printer. From 5bb23e4c6f335eca18b73dfb5517bbabd85d6782 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 7 Oct 2019 15:22:04 +0200 Subject: [PATCH 588/994] Make the height of the layer slider dynamic Prevents the action panel from overlapping the layer slider CURA-6853 --- plugins/PreviewStage/PreviewMain.qml | 1 + plugins/SimulationView/LayerSlider.qml | 5 +++++ plugins/SimulationView/SimulationView.py | 2 +- plugins/SimulationView/SimulationViewMainComponent.qml | 10 +++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 6b5ce2436b..cd448dc0b6 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -13,6 +13,7 @@ Item { Loader { + property var panelTop: actionPanelWidget.y id: previewMain anchors.fill: parent diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 88f298d1f5..d2af1e223b 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -176,6 +176,11 @@ Item } } + onHeightChanged : { + print("new height:" + height) + //rangeHandle.onHandleDragged() + } + // Upper handle Rectangle { diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 28d5a74523..3a7cb0d2fe 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -48,7 +48,7 @@ if TYPE_CHECKING: catalog = i18nCatalog("cura") -## View used to display g-code paths. +## The preview layer view. It is used to display g-code paths. class SimulationView(CuraView): # Must match SimulationViewMenuComponent.qml LAYER_VIEW_TYPE_MATERIAL_TYPE = 0 diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 58901652d3..51fc70ade8 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -14,6 +14,7 @@ Item property bool is_simulation_playing: false visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity + // A slider which lets users trace a single layer (XY movements) PathSlider { id: pathSlider @@ -170,18 +171,24 @@ Item } } + // Scrolls trough Z layers LayerSlider { + property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height + property double heightMargin: UM.Theme.getSize("default_margin").height id: layerSlider width: UM.Theme.getSize("slider_handle").width - height: UM.Theme.getSize("slider_layerview_size").height + height: preferredHeight + heightMargin * 2 < panelTop ? preferredHeight : panelTop - heightMargin * 2 anchors { right: parent.right verticalCenter: parent.verticalCenter + verticalCenterOffset: -(parent.height - panelTop) / 2 // center between parent top and panelTop rightMargin: UM.Theme.getSize("default_margin").width + bottomMargin: heightMargin + topMargin: heightMargin } // Custom properties @@ -209,6 +216,7 @@ Item // Make sure the slider handlers show the correct value after switching views Component.onCompleted: { + print("paneltop", panelTop, "screenscaleFactor") layerSlider.setLowerValue(UM.SimulationView.minimumLayer) layerSlider.setUpperValue(UM.SimulationView.currentLayer) } From f090450bba2349bb3b81a713f5d617d7f7316ee6 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 7 Oct 2019 16:27:25 +0200 Subject: [PATCH 589/994] Fix pixel-position of layer slider after the window was resized. CURA-6853 --- plugins/SimulationView/LayerSlider.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index d2af1e223b..9706b04e03 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -177,8 +177,8 @@ Item } onHeightChanged : { - print("new height:" + height) - //rangeHandle.onHandleDragged() + // After a height change, the pixel-position of the lower handle is out of sync with the property value + setLowerValue(lowerValue) } // Upper handle @@ -338,7 +338,7 @@ Item // set the slider position based on the lower value function setValue(value) { - + print("lower handle set value: " + value) // Normalize values between range, since using arrow keys will create out-of-the-range values value = sliderRoot.normalizeValue(value) From 74e7de1b54104b486350f8d5348369344e10dc13 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 14:59:12 +0200 Subject: [PATCH 590/994] Add intent into stats CURA-6632 --- cura/Settings/GlobalStack.py | 8 ++++++++ cura/Settings/MachineManager.py | 8 +------- plugins/SliceInfoPlugin/SliceInfo.py | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index f2f6277e6a..17daaf205a 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -131,6 +131,14 @@ class GlobalStack(CuraContainerStack): return "machine_stack" return configuration_type + def getIntentCategory(self) -> str: + intent_category = "default" + for extruder in self.extruderList: + category = extruder.intent.getMetaDataEntry("intent_category", "default") + if category != "default" and category != intent_category: + intent_category = category + return intent_category + def getBuildplateName(self) -> Optional[str]: name = None if self.variant.getId() != "empty_variant": diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 57da690d6d..bdde5aee14 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -632,13 +632,7 @@ class MachineManager(QObject): if not global_container_stack: return "" - intent_category = "default" - for extruder in global_container_stack.extruderList: - category = extruder.intent.getMetaDataEntry("intent_category", "default") - if category != "default" and category != intent_category: - intent_category = category - - return intent_category + return global_container_stack.getIntentCategory() # Provies a list of extruder positions that have a different intent from the active one. @pyqtProperty("QStringList", notify=activeIntentChanged) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 9308719227..acab445fd6 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -174,6 +174,7 @@ class SliceInfo(QObject, Extension): extruder_dict["extruder_settings"] = extruder_settings data["extruders"].append(extruder_dict) + data["intent_category"] = global_stack.getIntentCategory() data["quality_profile"] = global_stack.quality.getMetaData().get("quality_type") data["user_modified_setting_keys"] = self._getUserModifiedSettingKeys() From 551c9fe682bc0de92fee2d0071fda4980804b67d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Oct 2019 15:01:15 +0200 Subject: [PATCH 591/994] Update SliceInfo example CURA-6632 --- plugins/SliceInfoPlugin/example_data.html | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index 4294b0af6d..103eb55a6a 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -4,6 +4,7 @@ Operating System: Windows 10
Language: en_US
Machine Type: Ultimaker S5
+ Intent Profile: Default
Quality Profile: Fast
Using Custom Settings: No From 8940097265ded47180d1af1e007c908890e942eb Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 7 Oct 2019 21:35:28 +0200 Subject: [PATCH 592/994] Separate black and grey text for quality menu CURA-6846 --- cura/Settings/MachineManager.py | 21 ++++++++++++------- .../Custom/CustomPrintSetup.qml | 18 +++++++++++++--- .../PrintSetupSelectorHeader.qml | 7 ++++++- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 57da690d6d..a4ff8fbbfa 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1592,18 +1592,20 @@ class MachineManager(QObject): if not no_dialog and self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() - # The display name of currently active quality. + # The display name map of currently active quality. + # The display name has 2 parts, a main part and a suffix part. # This display name is: # - For built-in qualities (quality/intent): the quality type name, such as "Fine", "Normal", etc. # - For custom qualities: - - # Examples: # - "my_profile - Fine" (only based on a default quality, no intent involved) # - "my_profile - Engineering - Fine" (based on an intent) - @pyqtProperty(str, notify = activeQualityDisplayNameChanged) - def activeQualityDisplayName(self) -> str: + @pyqtProperty("QVariantMap", notify = activeQualityDisplayNameChanged) + def activeQualityDisplayNameMap(self) -> Dict[str, str]: global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: - return "" + return {"main": "", + "suffix": ""} display_name = global_stack.quality.getName() @@ -1612,13 +1614,18 @@ class MachineManager(QObject): intent_display_name = IntentCategoryModel.name_translation.get(intent_category, catalog.i18nc("@label", "Unknown")) display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, - the_rest = display_name) + the_rest = display_name) + + main_part = display_name + suffix_part = "" # Not a custom quality if global_stack.qualityChanges != empty_quality_changes_container: - display_name = self.activeQualityOrQualityChangesName + " - " + display_name + main_part = self.activeQualityOrQualityChangesName + suffix_part = display_name - return display_name + return {"main": main_part, + "suffix": suffix_part} ## Change the intent category of the current printer. # diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index a297b0a769..2698089d0c 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -100,18 +100,30 @@ Item function generateActiveQualityText() { - var result = Cura.MachineManager.activeQualityDisplayName + var resultMap = Cura.MachineManager.activeQualityDisplayNameMap + var resultMain = resultMap["main"] + var resultSuffix = resultMap["suffix"] + var result = "" if (Cura.MachineManager.isActiveQualityExperimental) { - result += " (Experimental)" + resultSuffix += " (Experimental)" } if (Cura.MachineManager.isActiveQualitySupported) { if (Cura.MachineManager.activeQualityLayerHeight > 0) { - result += " " + result = resultMain + if (resultSuffix) + { + result += " - " + } + result += "" + if (resultSuffix) + { + result += resultSuffix + } result += " - " result += Cura.MachineManager.activeQualityLayerHeight + "mm" result += "" diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index bb3a986929..a23b87fdbe 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -20,7 +20,12 @@ RowLayout { if (Cura.MachineManager.activeStack) { - var text = Cura.MachineManager.activeQualityDisplayName + var resultMap = Cura.MachineManager.activeQualityDisplayNameMap + var text = resultMap["main"] + if (resultMap["suffix"]) + { + text += " - " + resultMap["suffix"] + } if (!Cura.MachineManager.hasNotSupportedQuality) { From cfd577f235e41833b93c251b59fece2e3f9b8d3c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Oct 2019 10:37:19 +0200 Subject: [PATCH 593/994] Remove buildplate info from workspace save dialog --- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index d23c3d6580..99a0666ee1 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -139,22 +139,6 @@ UM.Dialog } } } - Row - { - visible: Cura.MachineManager.hasVariantBuildplates - width: parent.width - height: childrenRect.height - Label - { - text: catalog.i18nc("@action:label", "Build plate") - width: Math.floor(scroll.width / 3) | 0 - } - Label - { - text: Cura.activeStack != null ? Cura.MachineManager.activeStack.variant.name : "" - width: Math.floor(scroll.width / 3) | 0 - } - } Repeater { width: parent.width From 58fec04650af09e4acabfbad3a3c2f7e99efc533 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Oct 2019 10:53:58 +0200 Subject: [PATCH 594/994] Don't emit a globalcontainer changed signal when only the name changed Apart form it being way to agressive (and thus, slowing things down), it also caused a re-slice to be done when a printer was connected with another printer. --- cura/Settings/MachineManager.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a4ff8fbbfa..c43463f64d 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -221,10 +221,6 @@ class MachineManager(QObject): def _onGlobalContainerChanged(self) -> None: if self._global_container_stack: - try: - self._global_container_stack.nameChanged.disconnect(self._onMachineNameChanged) - except TypeError: # pyQtSignal gives a TypeError when disconnecting from something that was already disconnected. - pass try: self._global_container_stack.containersChanged.disconnect(self._onContainersChanged) except TypeError: @@ -249,7 +245,6 @@ class MachineManager(QObject): if self._global_container_stack: self._application.getPreferences().setValue("cura/active_machine", self._global_container_stack.getId()) - self._global_container_stack.nameChanged.connect(self._onMachineNameChanged) self._global_container_stack.containersChanged.connect(self._onContainersChanged) self._global_container_stack.propertyChanged.connect(self._onPropertyChanged) @@ -1058,9 +1053,6 @@ class MachineManager(QObject): self.activeMaterialChanged.emit() self.activeIntentChanged.emit() - def _onMachineNameChanged(self) -> None: - self.globalContainerChanged.emit() - def _onMaterialNameChanged(self) -> None: self.activeMaterialChanged.emit() @@ -1390,10 +1382,10 @@ class MachineManager(QObject): # instance with the same network key. @pyqtSlot(str) def switchPrinterType(self, machine_name: str) -> None: - Logger.log("i", "Attempting to switch the printer type to [%s]", machine_name) # Don't switch if the user tries to change to the same type of printer if self._global_container_stack is None or self.activeMachineDefinitionName == machine_name: return + Logger.log("i", "Attempting to switch the printer type to [%s]", machine_name) # Get the definition id corresponding to this machine name machine_definition_id = CuraContainerRegistry.getInstance().findDefinitionContainers(name = machine_name)[0].getId() # Try to find a machine with the same network key From 17ce0f5eb12f9195a4216fbabe591b664e3b90ee Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Oct 2019 10:59:37 +0200 Subject: [PATCH 595/994] Remove unused imports --- cura/Machines/Models/NozzleModel.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/cura/Machines/Models/NozzleModel.py b/cura/Machines/Models/NozzleModel.py index da3d4728e5..6b6503d187 100644 --- a/cura/Machines/Models/NozzleModel.py +++ b/cura/Machines/Models/NozzleModel.py @@ -6,11 +6,8 @@ from PyQt5.QtCore import Qt from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel -from UM.Util import parseBool from cura.Machines.ContainerTree import ContainerTree -from cura.Machines.VariantType import VariantType - class NozzleModel(ListModel): IdRole = Qt.UserRole + 1 From 6ed2b791664d4ad8eb998a7317aca9215d453852 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 8 Oct 2019 11:24:29 +0200 Subject: [PATCH 596/994] Rename 'First Layer Speed' which is about small features. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 211fdf74f3..f6b36672f4 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7577,7 +7577,7 @@ }, "small_feature_speed_factor_0": { - "label": "First Layer Speed", + "label": "Small Feature Initial Layer Speed", "description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.", "unit": "%", "type": "float", From 44a59a7f3b0408aca16a024ab47d53966bf12765 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 12:44:10 +0200 Subject: [PATCH 597/994] Fix typing Discovered during work on CURA-6793. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index c43463f64d..13b2c76bc6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -303,7 +303,7 @@ class MachineManager(QObject): if not containers: return - global_stack = containers[0] + global_stack = cast(GlobalStack, containers[0]) # Make sure that the default machine actions for this machine have been added self._application.getMachineActionManager().addDefaultMachineActions(global_stack) From f8449796c923a44a6b76680ca8ed2e654648f215 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 13:06:23 +0200 Subject: [PATCH 598/994] Reset the camera origin when uninverting zoom direction If zoom-to-cursor has been activated the camera origin will end up behind the camera. This resets it. Fixes #6490. --- resources/qml/Preferences/GeneralPage.qml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 11f79432c6..626190063b 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -360,7 +360,13 @@ UM.PreferencesPage id: invertZoomCheckbox text: catalog.i18nc("@action:button", "Invert the direction of camera zoom."); checked: boolCheck(UM.Preferences.getValue("view/invert_zoom")) - onClicked: UM.Preferences.setValue("view/invert_zoom", checked) + onClicked: { + if(!checked && zoomToMouseCheckbox.checked) //Fix for Github issue Ultimaker/Cura#6490: Make sure the camera origin is in front when unchecking. + { + UM.Controller.setCameraOrigin("home"); + } + UM.Preferences.setValue("view/invert_zoom", checked); + } } } From c6d5f3ecf223a7ed689e03cacd3d0ea8cf9aee17 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 13:15:04 +0200 Subject: [PATCH 599/994] Remove temporary profiles to test with They are no longer needed. Contributes to issue CURA-6864. --- resources/intent/smooth.inst.cfg | 15 --------------- resources/intent/strong.inst.cfg | 15 --------------- 2 files changed, 30 deletions(-) delete mode 100644 resources/intent/smooth.inst.cfg delete mode 100644 resources/intent/strong.inst.cfg diff --git a/resources/intent/smooth.inst.cfg b/resources/intent/smooth.inst.cfg deleted file mode 100644 index 094ccb596d..0000000000 --- a/resources/intent/smooth.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Smooth (TEST INTENT) -definition = ultimaker3 - -[metadata] -setting_version = 10 -type = intent -intent_category = smooth -quality_type = draft -variant = AA 0.4 -material = generic_pla - -[values] -infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/intent/strong.inst.cfg b/resources/intent/strong.inst.cfg deleted file mode 100644 index 368a2e4e73..0000000000 --- a/resources/intent/strong.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Strong (TEST INTENT) -definition = ultimaker3 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = draft -variant = AA 0.4 -material = generic_pla - -[values] -infill_sparse_density = 50 \ No newline at end of file From 4edffa4a210191f767264c6490d87f308430afdc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 13:16:38 +0200 Subject: [PATCH 600/994] Temporarily remove S5 intent profiles Ultimaker's marketing department is not able to explain why users would want to print more accurately, apparently, so we need to remove these. Contributes to issue CURA-6864. --- ...um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 34 ------------------- ..._s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 34 ------------------- ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 34 ------------------- ...um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 34 ------------------- ..._s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 34 ------------------- ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 34 ------------------- ...m_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 34 ------------------- ...s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 34 ------------------- ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 34 ------------------- 9 files changed, 306 deletions(-) delete mode 100644 resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg delete mode 100644 resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg deleted file mode 100644 index f627fbf74b..0000000000 --- a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Quick -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = smooth -quality_type = draft -material = generic_abs -variant = AA 0.4 - -[values] -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -speed_layer_0 = 20 -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere -infill_sparse_density = 15 -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg deleted file mode 100644 index be622d6cfe..0000000000 --- a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = fast -material = generic_abs -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg deleted file mode 100644 index 352c26d312..0000000000 --- a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = normal -material = generic_abs -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg deleted file mode 100644 index 553a68201d..0000000000 --- a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Quick -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = smooth -quality_type = draft -material = generic_pla -variant = AA 0.4 - -[values] -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -speed_layer_0 = 20 -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere -infill_sparse_density = 15 -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg deleted file mode 100644 index 0943bb2032..0000000000 --- a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = fast -material = generic_pla -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg deleted file mode 100644 index 053b849aff..0000000000 --- a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = normal -material = generic_pla -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg deleted file mode 100644 index 458b283dd8..0000000000 --- a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Quick -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = smooth -quality_type = draft -material = generic_tough_pla -variant = AA 0.4 - -[values] -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -speed_layer_0 = 20 -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere -infill_sparse_density = 15 -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg deleted file mode 100644 index d19ad53fae..0000000000 --- a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = fast -material = generic_tough_pla -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg deleted file mode 100644 index 23d8b1e39b..0000000000 --- a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -version = 4 -name = Accurate -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = engineering -quality_type = normal -material = generic_tough_pla -variant = AA 0.4 - -[values] -infill_line_width = =line_width -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -line_width = =machine_nozzle_size -speed_print = 30 -speed_infill = =speed_print -speed_layer_0 = 20 -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width -wall_thickness = =line_width * 3 -xy_offset = =- layer_height * 0.2 From dcd782418f79d9e20c5b930673f98f4b9891898d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 13:40:12 +0200 Subject: [PATCH 601/994] Add UMS5 intent profiles Ultimaker's marketing department is so far unable to explain why users of the Ultimaker S5 would want to print more accurately. So we wait with adding these until they have their story straight. Contributes to issue CURA-6864. --- ...um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ..._s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ ...um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ..._s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ ...m_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ...s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ 9 files changed, 306 insertions(+) create mode 100644 resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..f627fbf74b --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..be622d6cfe --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..352c26d312 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..553a68201d --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..0943bb2032 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..053b849aff --- /dev/null +++ b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..458b283dd8 --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..d19ad53fae --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..23d8b1e39b --- /dev/null +++ b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 From 23469948f6c178f31761fe4437dca8039436e04f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Oct 2019 13:58:31 +0200 Subject: [PATCH 602/994] Fix translation mistake in a message --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 9d2e4d1506..1437153f32 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -400,7 +400,7 @@ class CuraEngineBackend(QObject, Backend): self.setState(BackendState.NotStarted) if job.getResult() == StartJobResult.ObjectsWithDisabledExtruder: - self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice because there are objects associated with disabled Extruder %s." % job.getMessage()), + self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice because there are objects associated with disabled Extruder %s.") % job.getMessage(), title = catalog.i18nc("@info:title", "Unable to slice")) self._error_message.show() self.setState(BackendState.Error) From 23904e1dcacddb2675b63d1123466a337bb710bf Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 14:16:19 +0200 Subject: [PATCH 603/994] Don't cache machine manager and application This makes testing harder. Also fixed the typing of the application this way. Contributes to issue CURA-6793. --- cura/Machines/Models/NozzleModel.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cura/Machines/Models/NozzleModel.py b/cura/Machines/Models/NozzleModel.py index 6b6503d187..5f7f8b02f5 100644 --- a/cura/Machines/Models/NozzleModel.py +++ b/cura/Machines/Models/NozzleModel.py @@ -3,9 +3,9 @@ from PyQt5.QtCore import Qt -from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel +import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.ContainerTree import ContainerTree @@ -21,16 +21,13 @@ class NozzleModel(ListModel): self.addRoleName(self.HotendNameRole, "hotend_name") self.addRoleName(self.ContainerNodeRole, "container_node") - self._application = Application.getInstance() - self._machine_manager = self._application.getMachineManager() - - self._machine_manager.globalContainerChanged.connect(self._update) + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().globalContainerChanged.connect(self._update) self._update() def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - global_stack = self._machine_manager.activeMachine + global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if global_stack is None: self.setItems([]) return From 28466f7345aef3b324dc21ed48c4a6b4b4e7b8ca Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 8 Oct 2019 14:32:42 +0200 Subject: [PATCH 604/994] Elide long quality name CURA-6862 --- resources/qml/Preferences/ProfilesPage.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 51fe7ac81f..dc7c3d109f 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -531,8 +531,12 @@ Item Label { + anchors.left: parent.left + anchors.right: parent.right text: base.currentItemDisplayName font: UM.Theme.getFont("large_bold") + elide: Text.ElideRight + renderType: Text.NativeRendering } } From 570dfdab4b9263b2c216a59f59b366a9f401ecfd Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 8 Oct 2019 15:15:10 +0200 Subject: [PATCH 605/994] Fix project saving summary CURA-6865 --- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index 99a0666ee1..d698c0d3af 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -148,8 +148,18 @@ UM.Dialog { height: childrenRect.height width: parent.width - property string variantName: Cura.MachineManager.activeVariantNames[modelData] !== undefined ? Cura.MachineManager.activeVariantNames[modelData]: "" - property string materialName: Cura.MachineManager.getExtruder(modelData).material.name !== undefined ? Cura.MachineManager.getExtruder(modelData).material.name : "" + property string variantName: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[modelData] + var variant_name = extruder.variant.name + return (variant_name !== undefined) ? variant_name : "" + } + property string materialName: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[modelData] + var material_name = extruder.material.name + return (material_name !== undefined) ? material_name : "" + } Label { text: { From fb368a47882bcaa7a16c32bb21ff87e73921f1da Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 8 Oct 2019 15:16:25 +0200 Subject: [PATCH 606/994] Remove MachineManager.activeVariantNames CURA-6865 --- cura/Settings/MachineManager.py | 15 --------------- resources/qml/Menus/NozzleMenu.qml | 5 +++-- tests/TestMachineManager.py | 12 ------------ 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 13b2c76bc6..df77c16d00 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1111,21 +1111,6 @@ class MachineManager(QObject): def currentRootMaterialId(self) -> Dict[str, str]: return self._current_root_material_id - ## Return the variant names in the extruder stack(s). - ## For the variant in the global stack, use activeVariantBuildplateName - @pyqtProperty("QVariant", notify = activeVariantChanged) - def activeVariantNames(self) -> Dict[str, str]: - result = {} - - active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() - for stack in active_stacks: - variant_container = stack.variant - position = stack.getMetaDataEntry("position") - if variant_container and variant_container != empty_variant_container: - result[position] = variant_container.getName() - - return result - # Sets all quality and quality_changes containers to empty_quality and empty_quality_changes containers # for all stacks in the currently active machine. # diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 3d7dd1b6c5..a94ad10330 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -1,7 +1,7 @@ // Copyright (c) 2017 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.10 import QtQuick.Controls 1.4 import UM 1.2 as UM @@ -28,7 +28,8 @@ Menu text: model.hotend_name checkable: true checked: { - return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name + var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] + return extruder.variant.name == model.hotend_name } exclusiveGroup: group diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py index 313ada2bf0..96c0bc1bec 100644 --- a/tests/TestMachineManager.py +++ b/tests/TestMachineManager.py @@ -99,18 +99,6 @@ def test_allActiveMaterialIds(machine_manager, extruder_manager): assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"} -def test_activeVariantNames(machine_manager, extruder_manager): - extruder_1 = createMockedExtruder("extruder_1") - extruder_2 = createMockedExtruder("extruder_2") - extruder_1.getMetaDataEntry = MagicMock(return_value = "0") - extruder_2.getMetaDataEntry = MagicMock(return_value= "2") - extruder_1.variant = createMockedInstanceContainer("variant_1", "variant_name_1") - extruder_2.variant = createMockedInstanceContainer("variant_2", "variant_name_2") - extruder_manager.getActiveExtruderStacks = MagicMock(return_value=[extruder_1, extruder_2]) - - assert machine_manager.activeVariantNames == {"0": "variant_name_1", "2": "variant_name_2"} - - def test_globalVariantName(machine_manager, application): global_stack = application.getGlobalContainerStack() global_stack.variant = createMockedInstanceContainer("beep", "zomg") From b137e6a36d9038cf80a2a4932d490c89dc7a366e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 15:21:19 +0200 Subject: [PATCH 607/994] Don't add extruders twice upon start-up The extruders are added when changing printers anyway, and we call this change signal upon start-up. So one of them is going to do unnecessary work. Contributes to issue CURA-6793. --- cura/Settings/ExtruderManager.py | 2 -- cura/Settings/MachineManager.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 417f7b01ff..121b465432 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -42,8 +42,6 @@ class ExtruderManager(QObject): # TODO; I have no idea why this is a union of ID's and extruder stacks. This needs to be fixed at some point. self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] - self._addCurrentMachineExtruders() - Selection.selectionChanged.connect(self.resetSelectedObjectExtruders) ## Signal to notify other components when the list of extruders for a machine definition changes. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 13b2c76bc6..2454d5a67c 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -140,7 +140,7 @@ class MachineManager(QObject): activeVariantChanged = pyqtSignal() activeQualityChanged = pyqtSignal() activeIntentChanged = pyqtSignal() - activeStackChanged = pyqtSignal() # Emitted whenever the active stack is changed (ie: when changing between extruders, changing a profile, but not when changing a value) + activeStackChanged = pyqtSignal() # Emitted whenever the active extruder stack is changed (ie: when changing between extruders, changing a profile, but not when changing a value) extruderChanged = pyqtSignal() globalValueChanged = pyqtSignal() # Emitted whenever a value inside global container is changed. From dd8ee2e3d8b94148eaabb5f7e9816b3bbe92cee1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 15:22:12 +0200 Subject: [PATCH 608/994] Switch early fail around to reduce indentation Makes this more readable. Contributes to issue CURA-6793. --- cura/Settings/ExtruderManager.py | 47 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 121b465432..8f38eda519 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -323,35 +323,36 @@ class ExtruderManager(QObject): ## Adds the extruders of the currently active machine. def _addCurrentMachineExtruders(self) -> None: global_stack = self._application.getGlobalContainerStack() + if not global_stack: + return + extruders_changed = False + container_registry = ContainerRegistry.getInstance() + global_stack_id = global_stack.getId() - if global_stack: - container_registry = ContainerRegistry.getInstance() - global_stack_id = global_stack.getId() + # Gets the extruder trains that we just created as well as any that still existed. + extruder_trains = container_registry.findContainerStacks(type = "extruder_train", machine = global_stack_id) - # Gets the extruder trains that we just created as well as any that still existed. - extruder_trains = container_registry.findContainerStacks(type = "extruder_train", machine = global_stack_id) + # Make sure the extruder trains for the new machine can be placed in the set of sets + if global_stack_id not in self._extruder_trains: + self._extruder_trains[global_stack_id] = {} + extruders_changed = True - # Make sure the extruder trains for the new machine can be placed in the set of sets - if global_stack_id not in self._extruder_trains: - self._extruder_trains[global_stack_id] = {} - extruders_changed = True + # Register the extruder trains by position + for extruder_train in extruder_trains: + extruder_position = extruder_train.getMetaDataEntry("position") + self._extruder_trains[global_stack_id][extruder_position] = extruder_train - # Register the extruder trains by position - for extruder_train in extruder_trains: - extruder_position = extruder_train.getMetaDataEntry("position") - self._extruder_trains[global_stack_id][extruder_position] = extruder_train + # regardless of what the next stack is, we have to set it again, because of signal routing. ??? + extruder_train.setParent(global_stack) + extruder_train.setNextStack(global_stack) + extruders_changed = True - # regardless of what the next stack is, we have to set it again, because of signal routing. ??? - extruder_train.setParent(global_stack) - extruder_train.setNextStack(global_stack) - extruders_changed = True - - self.fixSingleExtrusionMachineExtruderDefinition(global_stack) - if extruders_changed: - self.extrudersChanged.emit(global_stack_id) - self.setActiveExtruderIndex(0) - self.activeExtruderChanged.emit() + self.fixSingleExtrusionMachineExtruderDefinition(global_stack) + if extruders_changed: + self.extrudersChanged.emit(global_stack_id) + self.setActiveExtruderIndex(0) + self.activeExtruderChanged.emit() # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. From 0238f65e6ab615888f24774df6ee0b363434576f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Oct 2019 16:32:20 +0200 Subject: [PATCH 609/994] Remove double call of _onGlobalContainerChanged and activeExtruderChanged on switching When switching printers, it would first emit the global container changed signal which connects to _onGlobalContainerChanged, then update stuff in the extruder manager, then manually call _onGlobalContainerChanged again to update some other stuff with the new data from the extruder manager. This was prohibitively expensive, so this prevents that. Another double or triple emit of the activeExtruderChanged was removed in the extruder manager when creating the extruders for a printer: It would first set the extruder number to 0, possibly emitting the signal, then emit the signal just to be sure since the extruder itself changed (rather than just the number), and then change the extruder number to the preferred extruder, possibly again emitting a signal. Now it just sets the extruder number to the preferred extruder and always emits the signal once (either through setting the extruder number or manually afterwards). Contributes to issue CURA-6793. --- cura/Settings/ExtruderManager.py | 12 +++--------- cura/Settings/MachineManager.py | 16 +++++++++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 8f38eda519..b7fca7e6f9 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant # For communicating data and events to Qt. @@ -320,12 +320,8 @@ class ExtruderManager(QObject): self.resetSelectedObjectExtruders() - ## Adds the extruders of the currently active machine. - def _addCurrentMachineExtruders(self) -> None: - global_stack = self._application.getGlobalContainerStack() - if not global_stack: - return - + ## Adds the extruders to the selected machine. + def addMachineExtruders(self, global_stack: GlobalStack) -> None: extruders_changed = False container_registry = ContainerRegistry.getInstance() global_stack_id = global_stack.getId() @@ -351,8 +347,6 @@ class ExtruderManager(QObject): self.fixSingleExtrusionMachineExtruderDefinition(global_stack) if extruders_changed: self.extrudersChanged.emit(global_stack_id) - self.setActiveExtruderIndex(0) - self.activeExtruderChanged.emit() # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 2454d5a67c..4dc8e672aa 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -219,7 +219,10 @@ class MachineManager(QObject): return 0 return len(general_definition_containers[0].getAllKeys()) + ## Triggered when the global container stack is changed in CuraApplication. def _onGlobalContainerChanged(self) -> None: + import traceback + traceback.print_stack() if self._global_container_stack: try: self._global_container_stack.containersChanged.disconnect(self._onContainersChanged) @@ -298,7 +301,6 @@ class MachineManager(QObject): self.blurSettings.emit() # Ensure no-one has focus. container_registry = CuraContainerRegistry.getInstance() - containers = container_registry.findContainerStacks(id = stack_id) if not containers: return @@ -308,21 +310,25 @@ class MachineManager(QObject): # Make sure that the default machine actions for this machine have been added self._application.getMachineActionManager().addDefaultMachineActions(global_stack) - ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack) + extruder_manager = ExtruderManager.getInstance() + extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack) if not global_stack.isValid(): # Mark global stack as invalid ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId()) return # We're done here self._global_container_stack = global_stack + extruder_manager.addMachineExtruders(global_stack) self._application.setGlobalContainerStack(global_stack) - ExtruderManager.getInstance()._globalContainerStackChanged() - self._onGlobalContainerChanged() # Switch to the first enabled extruder self.updateDefaultExtruder() default_extruder_position = int(self.defaultExtruderPosition) - ExtruderManager.getInstance().setActiveExtruderIndex(default_extruder_position) + old_active_extruder_index = extruder_manager.activeExtruderIndex + extruder_manager.setActiveExtruderIndex(default_extruder_position) + if old_active_extruder_index == default_extruder_position: + # This signal might not have been emitted yet (if it didn't change) but we still want the models to update that depend on it because we changed the contents of the containers too. + extruder_manager.activeExtruderChanged.emit() self.__emitChangedSignals() From cadc145008e5011f4dccf8e05f768773c52bd078 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Oct 2019 16:49:54 +0200 Subject: [PATCH 610/994] Prevent infinite recursion in material page if it could not be found --- resources/qml/Preferences/Materials/MaterialsPage.qml | 11 +++++++---- resources/qml/Preferences/Materials/MaterialsView.qml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index a8de240924..32c4773640 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -59,11 +59,14 @@ Item onCurrentItemChanged: { forceActiveFocus() - materialDetailsPanel.currentItem = currentItem - // CURA-6679 If the current item is gone after the model update, reset the current item to the active material. - if (currentItem == null) + if(materialDetailsPanel.currentItem != currentItem) { - resetExpandedActiveMaterial() + materialDetailsPanel.currentItem = currentItem + // CURA-6679 If the current item is gone after the model update, reset the current item to the active material. + if (currentItem == null) + { + resetExpandedActiveMaterial() + } } } diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 0f5eba2f2f..6d5a8119c5 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -17,7 +17,7 @@ TabView property QtObject properties property var currentMaterialNode: null - property bool editingEnabled: false; + property bool editingEnabled: false property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€" property real firstColumnWidth: (width * 0.50) | 0 property real secondColumnWidth: (width * 0.40) | 0 From 9158857477338bc5134fcd4eb868eac60464f633 Mon Sep 17 00:00:00 2001 From: FiCacador <38703952+FiCacador@users.noreply.github.com> Date: Wed, 9 Oct 2019 01:56:48 +0100 Subject: [PATCH 611/994] Reverse Y axis When an AMF file was imported, the Y axis was reversed, creating a mirrored object. This reverses the Y axis so the object is correctly imported. --- plugins/AMFReader/AMFReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/AMFReader/AMFReader.py b/plugins/AMFReader/AMFReader.py index d35fbe3d40..f997c918c5 100644 --- a/plugins/AMFReader/AMFReader.py +++ b/plugins/AMFReader/AMFReader.py @@ -94,7 +94,7 @@ class AMFReader(MeshReader): if t.tag == "x": v[0] = float(t.text) * scale elif t.tag == "y": - v[2] = float(t.text) * scale + v[2] = - float(t.text) * scale elif t.tag == "z": v[1] = float(t.text) * scale amf_mesh_vertices.append(v) From 4ffda015db295feeff336c5eedc92d923289f32e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 9 Oct 2019 10:53:58 +0200 Subject: [PATCH 612/994] Implement lazy loading for machine nodes Should be completely transparent. It'll fail the unit tests though because it now pretends that all printers have machine nodes. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 65 +++++++++++++++---------------- cura/Settings/CuraStackBuilder.py | 4 -- 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 50ccc893a9..0c39f0d391 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -3,7 +3,6 @@ from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. -from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal import cura.CuraApplication # Imported like this to prevent circular dependencies. from cura.Machines.MachineNode import MachineNode @@ -11,7 +10,6 @@ from cura.Settings.GlobalStack import GlobalStack # To listen only to global st from typing import Dict, List, TYPE_CHECKING import time -import UM.FlameProfiler if TYPE_CHECKING: from cura.Machines.QualityGroup import QualityGroup @@ -38,13 +36,9 @@ class ContainerTree: return cls.__instance def __init__(self) -> None: - self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes. + self.machines = self.MachineNodeMap() # Mapping from definition ID to machine nodes with lazy loading. self.materialsChanged = Signal() # Emitted when any of the material nodes in the tree got changed. - container_registry = ContainerRegistry.getInstance() - container_registry.containerAdded.connect(self._machineAdded) - self._loadAll() - ## Get the quality groups available for the currently activated printer. # # This contains all quality groups, enabled or disabled. To check whether @@ -76,19 +70,6 @@ class ContainerTree: extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) - # Add a machine node by the id of it's definition. - # This is automatically called by the _machineAdded function, but it's sometimes needed to add a machine node - # faster than would have been done when waiting on any signals (for instance; when creating an entirely new machine) - @UM.FlameProfiler.profile - def addMachineNodeByDefinitionId(self, definition_id: str) -> None: - if definition_id in self.machines: - return # Already have this definition ID. - - start_time = time.time() - self.machines[definition_id] = MachineNode(definition_id) - self.machines[definition_id].materialsChanged.connect(self.materialsChanged) - Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) - ## Builds the initial container tree. def _loadAll(self): Logger.log("i", "Building container tree.") @@ -97,26 +78,15 @@ class ContainerTree: for stack in all_stacks: if not isinstance(stack, GlobalStack): continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. - definition_id = stack.definition.getId() - if definition_id not in self.machines: - definition_start_time = time.time() - self.machines[definition_id] = MachineNode(definition_id) - self.machines[definition_id].materialsChanged.connect(self.materialsChanged) - Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - definition_start_time)) + _ = self.machines[stack.definition.getId()] # TODO: Load this lazily. Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) - ## When a printer gets added, we need to build up the tree for that container. - def _machineAdded(self, container_stack: ContainerInterface) -> None: - if not isinstance(container_stack, GlobalStack): - return # Not our concern. - self.addMachineNodeByDefinitionId(container_stack.definition.getId()) - ## For debugging purposes, visualise the entire container tree as it stands # now. def _visualise_tree(self) -> str: lines = ["% CONTAINER TREE"] # Start with array and then combine into string, for performance. - for machine in self.machines.values(): + for machine in self.machines.machines.values(): lines.append(" # " + machine.container_id) for variant in machine.variants.values(): lines.append(" * " + variant.container_id) @@ -126,4 +96,31 @@ class ContainerTree: lines.append(" - " + quality.container_id) for intent in quality.intents.values(): lines.append(" . " + intent.container_id) - return "\n".join(lines) \ No newline at end of file + return "\n".join(lines) + + ## Dictionary-like object that contains the machines. + # + # This handles the lazy loading of MachineNodes. + class MachineNodeMap: + def __init__(self): + self.machines = {} + + ## Returns whether a printer with a certain definition ID exists. This + # is regardless of whether or not the printer is loaded yet. + # \param definition_id The definition to look for. + # \return Whether or not a printer definition exists with that name. + def __contains__(self, definition_id: str) -> bool: + return len(ContainerRegistry.getInstance().findInstanceContainersMetadata(id = definition_id)) == 0 + + ## Returns a machine node for the specified definition ID. + # + # If the machine node wasn't loaded yet, this will load it lazily. + # \param definition_id The definition to look for. + # \return A machine node for that definition. + def __getitem__(self, definition_id: str) -> MachineNode: + if definition_id not in self.machines: + start_time = time.time() + self.machines[definition_id] = MachineNode(definition_id) + self.machines[definition_id].materialsChanged.connect(ContainerTree.getInstance().materialsChanged) + Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) + return self.machines[definition_id] \ No newline at end of file diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index b82c5141fb..61a04e1be6 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -37,10 +37,6 @@ class CuraStackBuilder: return None machine_definition = definitions[0] - # The container tree listens to the containerAdded signal to add the definition and build the tree, - # but that signal is emitted with a delay which might not have passed yet. - # Therefore we must make sure that it's manually added here. - container_tree.addMachineNodeByDefinitionId(machine_definition.getId()) machine_node = container_tree.machines[machine_definition.getId()] generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName()) From e5b90ee306f84dd9b41b6c4abad72185b7bead8c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Oct 2019 12:49:45 +0200 Subject: [PATCH 613/994] Fix is_experimental flag update CURA-6869 --- cura/Machines/MachineNode.py | 4 ++-- cura/Settings/MachineManager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 3a8a319b0b..e71801fbb1 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -85,9 +85,9 @@ class MachineNode(ContainerNode): continue quality_groups[quality_type] = QualityGroup(name = global_quality_node.getMetaDataEntry("name", "Unnamed profile"), quality_type = quality_type) quality_groups[quality_type].node_for_global = global_quality_node - for extruder, qualities_per_type in enumerate(qualities_per_type_per_extruder): + for extruder_position, qualities_per_type in enumerate(qualities_per_type_per_extruder): if quality_type in qualities_per_type: - quality_groups[quality_type].nodes_for_extruders[extruder] = qualities_per_type[quality_type] + quality_groups[quality_type].setExtruderNode(extruder_position, qualities_per_type[quality_type]) available_quality_types = set(quality_groups.keys()) for extruder_nr, qualities_per_type in enumerate(qualities_per_type_per_extruder): diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 11f05fc754..b62b3516f6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -619,7 +619,7 @@ class MachineManager(QObject): global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: return False - return Util.parseBool(global_container_stack.quality.getMetaDataEntry("is_experimental", False)) + return self.activeQualityGroup().is_experimental @pyqtProperty(str, notify = activeIntentChanged) def activeIntentCategory(self) -> str: From 902b9f278eda41b35509af128f10152a5eb1a93d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 9 Oct 2019 12:01:16 +0200 Subject: [PATCH 614/994] Add tooltips for view orientation buttons. --- resources/qml/ViewOrientationControls.qml | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index 5750e935f4..de594ac008 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -20,29 +20,59 @@ Row { iconSource: UM.Theme.getIcon("view_3d") onClicked: Cura.Actions.view3DCamera.trigger() + + UM.TooltipArea + { + anchors.fill: parent + text: catalog.i18nc("@info:tooltip", "3D View") + } } ViewOrientationButton { iconSource: UM.Theme.getIcon("view_front") onClicked: Cura.Actions.viewFrontCamera.trigger() + + UM.TooltipArea + { + anchors.fill: parent + text: catalog.i18nc("@info:tooltip", "Front View") + } } ViewOrientationButton { iconSource: UM.Theme.getIcon("view_top") onClicked: Cura.Actions.viewTopCamera.trigger() + + UM.TooltipArea + { + anchors.fill: parent + text: catalog.i18nc("@info:tooltip", "Top View") + } } ViewOrientationButton { iconSource: UM.Theme.getIcon("view_left") onClicked: Cura.Actions.viewLeftSideCamera.trigger() + + UM.TooltipArea + { + anchors.fill: parent + text: catalog.i18nc("@info:tooltip", "Left View") + } } ViewOrientationButton { iconSource: UM.Theme.getIcon("view_right") onClicked: Cura.Actions.viewRightSideCamera.trigger() + + UM.TooltipArea + { + anchors.fill: parent + text: catalog.i18nc("@info:tooltip", "Right View") + } } } From 5199e3e6db070c2ac45d3aa2d9fbec5e9e2d0a7f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 9 Oct 2019 16:44:00 +0200 Subject: [PATCH 615/994] Add background job to pre-load other added printers Not just the active one. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 0c39f0d391..a1adae7fe4 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -1,6 +1,8 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from UM.Job import Job # For our background task of loading MachineNodes lazily. +from UM.JobQueue import JobQueue # For our background task of loading MachineNodes lazily. from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry # To listen to containers being added. from UM.Signal import Signal @@ -38,6 +40,7 @@ class ContainerTree: def __init__(self) -> None: self.machines = self.MachineNodeMap() # Mapping from definition ID to machine nodes with lazy loading. self.materialsChanged = Signal() # Emitted when any of the material nodes in the tree got changed. + cura.CuraApplication.CuraApplication.getInstance().initializationFinished.connect(self._onStartupFinished) # Start the background task to load more machine nodes after start-up is completed. ## Get the quality groups available for the currently activated printer. # @@ -82,6 +85,10 @@ class ContainerTree: Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) + ## Ran after completely starting up the application. + def _onStartupFinished(self): + JobQueue.getInstance().add(self.MachineNodeLoadJob(self)) + ## For debugging purposes, visualise the entire container tree as it stands # now. def _visualise_tree(self) -> str: @@ -119,8 +126,39 @@ class ContainerTree: # \return A machine node for that definition. def __getitem__(self, definition_id: str) -> MachineNode: if definition_id not in self.machines: + print("-----------------------------------bluuuh", definition_id) start_time = time.time() self.machines[definition_id] = MachineNode(definition_id) self.machines[definition_id].materialsChanged.connect(ContainerTree.getInstance().materialsChanged) Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) - return self.machines[definition_id] \ No newline at end of file + return self.machines[definition_id] + + ## Returns whether we've already cached this definition's node. + # \param definition_id The definition that we may have cached. + # \return ``True`` if it's cached. + def is_loaded(self, definition_id: str) -> bool: + return definition_id in self.machines + + ## Pre-loads all currently added printers as a background task so that + # switching printers in the interface is faster. + class MachineNodeLoadJob(Job): + ## Creates a new background task. + # \param tree_root The container tree instance. This cannot be + # obtained through the singleton static function since the instance + # may not yet be constructed completely. + def __init__(self, tree_root: "ContainerTree"): + self.tree_root = tree_root + super().__init__() + + ## Starts the background task. + # + # The ``JobQueue`` will schedule this on a different thread. + def run(self) -> None: + currently_added = ContainerRegistry.getInstance().findContainerStacks() # Find all currently added global stacks. + for stack in currently_added: + time.sleep(0.5) + if not isinstance(stack, GlobalStack): + continue + definition_id = stack.definition.getId() + if not self.tree_root.machines.is_loaded(definition_id): + _ = self.tree_root.machines[definition_id] \ No newline at end of file From c5b957d0b129b027af86743a6e27b762c1eeec32 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 9 Oct 2019 16:44:45 +0200 Subject: [PATCH 616/994] Remove debug code Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index a1adae7fe4..bb5669ad61 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -89,22 +89,6 @@ class ContainerTree: def _onStartupFinished(self): JobQueue.getInstance().add(self.MachineNodeLoadJob(self)) - ## For debugging purposes, visualise the entire container tree as it stands - # now. - def _visualise_tree(self) -> str: - lines = ["% CONTAINER TREE"] # Start with array and then combine into string, for performance. - for machine in self.machines.machines.values(): - lines.append(" # " + machine.container_id) - for variant in machine.variants.values(): - lines.append(" * " + variant.container_id) - for material in variant.materials.values(): - lines.append(" + " + material.container_id) - for quality in material.qualities.values(): - lines.append(" - " + quality.container_id) - for intent in quality.intents.values(): - lines.append(" . " + intent.container_id) - return "\n".join(lines) - ## Dictionary-like object that contains the machines. # # This handles the lazy loading of MachineNodes. @@ -126,7 +110,6 @@ class ContainerTree: # \return A machine node for that definition. def __getitem__(self, definition_id: str) -> MachineNode: if definition_id not in self.machines: - print("-----------------------------------bluuuh", definition_id) start_time = time.time() self.machines[definition_id] = MachineNode(definition_id) self.machines[definition_id].materialsChanged.connect(ContainerTree.getInstance().materialsChanged) From 4148f56d2b58465055914910f08e1a92fe657586 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 9 Oct 2019 16:51:28 +0200 Subject: [PATCH 617/994] Remove external dependency from SimulationViewMainComponent Previously, panelTop had to be defined externally whenever SimulationViewMainComponent was used. I renamed it and set a default so the binding by a parent is optional. CURA-6853 --- plugins/PreviewStage/PreviewMain.qml | 9 ++++++++- plugins/SimulationView/LayerSlider.qml | 1 - plugins/SimulationView/SimulationViewMainComponent.qml | 10 +++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index cd448dc0b6..a065a751ac 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -13,11 +13,18 @@ Item { Loader { - property var panelTop: actionPanelWidget.y id: previewMain anchors.fill: parent source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : "" + + // Indicate that the layer slider should stay above the action panel + Binding + { + target: previewMain.item + property: "layerSliderSafeYMax" + value: actionPanelWidget.y + } } Cura.ActionPanelWidget diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 9706b04e03..15b0fdbe12 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -338,7 +338,6 @@ Item // set the slider position based on the lower value function setValue(value) { - print("lower handle set value: " + value) // Normalize values between range, since using arrow keys will create out-of-the-range values value = sliderRoot.normalizeValue(value) diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 51fc70ade8..c115dafe26 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -12,6 +12,11 @@ import Cura 1.0 as Cura Item { property bool is_simulation_playing: false + // By default, the layer slider can extend to the entire height of the parent + // A parent may bind this property to indicate the bottom of a safe area + // for the Layer slider + property var layerSliderSafeYMax: parent.height + visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity // A slider which lets users trace a single layer (XY movements) @@ -179,13 +184,13 @@ Item id: layerSlider width: UM.Theme.getSize("slider_handle").width - height: preferredHeight + heightMargin * 2 < panelTop ? preferredHeight : panelTop - heightMargin * 2 + height: preferredHeight + heightMargin * 2 < layerSliderSafeYMax ? preferredHeight : layerSliderSafeYMax - heightMargin * 2 anchors { right: parent.right verticalCenter: parent.verticalCenter - verticalCenterOffset: -(parent.height - panelTop) / 2 // center between parent top and panelTop + verticalCenterOffset: -(parent.height - layerSliderSafeYMax) / 2 // center between parent top and layerSliderSafeYMax rightMargin: UM.Theme.getSize("default_margin").width bottomMargin: heightMargin topMargin: heightMargin @@ -216,7 +221,6 @@ Item // Make sure the slider handlers show the correct value after switching views Component.onCompleted: { - print("paneltop", panelTop, "screenscaleFactor") layerSlider.setLowerValue(UM.SimulationView.minimumLayer) layerSlider.setUpperValue(UM.SimulationView.currentLayer) } From 87bbf3259791efc1724f3509f0db239b6af1794e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 9 Oct 2019 16:53:19 +0200 Subject: [PATCH 618/994] Rename is_simulation_playing CURA-6853 --- .../SimulationView/SimulationViewMainComponent.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index c115dafe26..ddbb5b6224 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -11,7 +11,7 @@ import Cura 1.0 as Cura Item { - property bool is_simulation_playing: false + property bool isSimulationPlaying: false // By default, the layer slider can extend to the entire height of the parent // A parent may bind this property to indicate the bottom of a safe area // for the Layer slider @@ -64,7 +64,7 @@ Item UM.SimpleButton { id: playButton - iconSource: !is_simulation_playing ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg" + iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg" width: UM.Theme.getSize("small_button").width height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("slider_handle_active") @@ -94,7 +94,7 @@ Item onClicked: { - if(is_simulation_playing) + if(isSimulationPlaying) { pauseSimulation() } @@ -108,7 +108,7 @@ Item { UM.SimulationView.setSimulationRunning(false) simulationTimer.stop() - is_simulation_playing = false + isSimulationPlaying = false layerSlider.manuallyChanged = true pathSlider.manuallyChanged = true } @@ -137,7 +137,7 @@ Item // When the user plays the simulation, if the path slider is at the end of this layer, we start // the simulation at the beginning of the current layer. - if (!is_simulation_playing) + if (!isSimulationPlaying) { if (currentPath >= numPaths) { @@ -172,7 +172,7 @@ Item } // The status must be set here instead of in the resumeSimulation function otherwise it won't work // correctly, because part of the logic is in this trigger function. - is_simulation_playing = true + isSimulationPlaying = true } } From ed6539812e104355be0507b85bd9d258d22b1083 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Oct 2019 17:12:06 +0200 Subject: [PATCH 619/994] Ensure that all material profiles get metadata updates CURA-6868 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 7dfa6483d2..fe0f73f2b3 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -87,7 +87,6 @@ class XmlMaterialProfile(InstanceContainer): container.metaDataChanged.emit(container) for k, v in new_setting_values_dict.items(): self.setProperty(k, "value", v) - return ## Overridden from InstanceContainer, similar to setMetaDataEntry. # without this function the setName would only set the name of the specific nozzle / material / machine combination container From 44cb810c855406a467d5b06a93f84ffc5c101c5c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Oct 2019 22:28:55 +0200 Subject: [PATCH 620/994] If None crash CURA-6869 --- cura/Settings/MachineManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b62b3516f6..2fbc5b4fd6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -619,7 +619,10 @@ class MachineManager(QObject): global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_container_stack: return False - return self.activeQualityGroup().is_experimental + active_quality_group = self.activeQualityGroup() + if active_quality_group is None: + return False + return active_quality_group.is_experimental @pyqtProperty(str, notify = activeIntentChanged) def activeIntentCategory(self) -> str: From d60b26db159083896f49079c8a415562ca3fd91f Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 10 Oct 2019 09:27:23 +0200 Subject: [PATCH 621/994] None-check for material diameter. Fixes a crash for materials which don't have that metadata-entry, such as an empty material (UM2) CURA-6873 --- cura/Machines/VariantNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index fa0c61bd3d..27e359afb1 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -84,7 +84,7 @@ class VariantNode(ContainerNode): return material_node # First fallback: Choose any material with matching diameter. for material_node in self.materials.values(): - if approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + if material_node.getMetaDataEntry("approximate_diameter") and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node fallback = next(iter(self.materials.values())) # Should only happen with empty material node. Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format( From ec4817db8725bb3012ca0b980e8eaec0a99a0ea4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 10 Oct 2019 09:55:17 +0200 Subject: [PATCH 622/994] Fix crash when syncing with configuration that has no printcores active CURA-6826 --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 2fbc5b4fd6..3fb55c0e70 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1434,6 +1434,8 @@ class MachineManager(QObject): else: machine_node = ContainerTree.getInstance().machines.get(self._global_container_stack.definition.getId()) variant_node = machine_node.variants.get(extruder_configuration.hotendID) + if variant_node is None: + continue self._setVariantNode(position, variant_node) # Find the material profile that the printer has stored. From 25db711adc2878248a3273ecf91cebdbe04f5fd7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 10 Oct 2019 12:57:27 +0200 Subject: [PATCH 623/994] Fix tooltips absorbed mouseclicks for view-buttons. --- resources/qml/ViewOrientationControls.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index de594ac008..97f2bb9400 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -25,6 +25,7 @@ Row { anchors.fill: parent text: catalog.i18nc("@info:tooltip", "3D View") + acceptedButtons: Qt.NoButton } } @@ -37,6 +38,7 @@ Row { anchors.fill: parent text: catalog.i18nc("@info:tooltip", "Front View") + acceptedButtons: Qt.NoButton } } @@ -49,6 +51,7 @@ Row { anchors.fill: parent text: catalog.i18nc("@info:tooltip", "Top View") + acceptedButtons: Qt.NoButton } } @@ -61,6 +64,7 @@ Row { anchors.fill: parent text: catalog.i18nc("@info:tooltip", "Left View") + acceptedButtons: Qt.NoButton } } @@ -73,6 +77,7 @@ Row { anchors.fill: parent text: catalog.i18nc("@info:tooltip", "Right View") + acceptedButtons: Qt.NoButton } } } From 07a20e131aa96f440eb89a2ab575eedc880bbcf6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 10 Oct 2019 13:03:39 +0200 Subject: [PATCH 624/994] Prevent changing material / variant of disabled extruder It is disabled, so changing it's material / variant doesn't make that much sense... CURA-6872 --- .../qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 5 ++++- resources/qml/Menus/MaterialMenu.qml | 3 +++ resources/qml/Menus/NozzleMenu.qml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 6f3d6ffa17..fda9ee35ac 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -221,6 +221,7 @@ Item OldControls.CheckBox { + id: enabledCheckbox checked: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.isEnabled : false enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder. height: parent.height @@ -265,6 +266,7 @@ Item text: Cura.MachineManager.activeStack !== null ? Cura.MachineManager.activeStack.material.name : "" tooltip: text + enabled: enabledCheckbox.checked width: selectors.controlWidth height: parent.height @@ -324,7 +326,8 @@ Item height: parent.height width: selectors.controlWidth style: UM.Theme.styles.print_setup_header_button - activeFocusOnPress: true; + activeFocusOnPress: true + enabled: enabledCheckbox.checked menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } } diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index a574e240d3..9720c81879 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -50,6 +50,7 @@ Menu { text: model.brand + " " + model.name checkable: true + enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled checked: model.root_material_id === menu.currentRootMaterialId onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) exclusiveGroup: favoriteGroup // One favorite and one item from the others can be active at the same time. @@ -72,6 +73,7 @@ Menu { text: model.name checkable: true + enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled checked: model.root_material_id === menu.currentRootMaterialId exclusiveGroup: group onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) @@ -110,6 +112,7 @@ Menu { text: model.name checkable: true + enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled checked: model.id === menu.activeMaterialId exclusiveGroup: group onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index a94ad10330..a291f125eb 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -32,7 +32,7 @@ Menu return extruder.variant.name == model.hotend_name } exclusiveGroup: group - + enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled onTriggered: { Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node); } From 7b2037fd47b4e2092aa738b555da7a226946a003 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 14:30:39 +0200 Subject: [PATCH 625/994] Fix code style --- plugins/AMFReader/AMFReader.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/AMFReader/AMFReader.py b/plugins/AMFReader/AMFReader.py index f997c918c5..6c5ee91e87 100644 --- a/plugins/AMFReader/AMFReader.py +++ b/plugins/AMFReader/AMFReader.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 fieldOfView +# Copyright (c) 2019 fieldOfView, Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. # This AMF parser is based on the AMF parser in legacy cura: @@ -39,9 +39,9 @@ class AMFReader(MeshReader): MimeTypeDatabase.addMimeType( MimeType( - name="application/x-amf", - comment="AMF", - suffixes=["amf"] + name = "application/x-amf", + comment = "AMF", + suffixes = ["amf"] ) ) @@ -94,7 +94,7 @@ class AMFReader(MeshReader): if t.tag == "x": v[0] = float(t.text) * scale elif t.tag == "y": - v[2] = - float(t.text) * scale + v[2] = -float(t.text) * scale elif t.tag == "z": v[1] = float(t.text) * scale amf_mesh_vertices.append(v) @@ -114,7 +114,7 @@ class AMFReader(MeshReader): f[2] = int(t.text) indices.append(f) - mesh = trimesh.base.Trimesh(vertices=numpy.array(amf_mesh_vertices, dtype=numpy.float32), faces=numpy.array(indices, dtype=numpy.int32)) + mesh = trimesh.base.Trimesh(vertices = numpy.array(amf_mesh_vertices, dtype = numpy.float32), faces = numpy.array(indices, dtype = numpy.int32)) mesh.merge_vertices() mesh.remove_unreferenced_vertices() mesh.fix_normals() @@ -123,7 +123,7 @@ class AMFReader(MeshReader): new_node = CuraSceneNode() new_node.setSelectable(True) new_node.setMeshData(mesh_data) - new_node.setName(base_name if len(nodes)==0 else "%s %d" % (base_name, len(nodes))) + new_node.setName(base_name if len(nodes) == 0 else "%s %d" % (base_name, len(nodes))) new_node.addDecorator(BuildPlateDecorator(CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate)) new_node.addDecorator(SliceableObjectDecorator()) @@ -165,9 +165,9 @@ class AMFReader(MeshReader): indices.append(face) face_count += 1 - vertices = numpy.asarray(vertices, dtype=numpy.float32) - indices = numpy.asarray(indices, dtype=numpy.int32) + vertices = numpy.asarray(vertices, dtype = numpy.float32) + indices = numpy.asarray(indices, dtype = numpy.int32) normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count) - mesh_data = MeshData(vertices=vertices, indices=indices, normals=normals) + mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals) return mesh_data From 268da885ee7b006e3b5d3509b783a487643fe127 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 14:48:46 +0200 Subject: [PATCH 626/994] Remove unused _loadAll function This one is no longer used since we no longer load all stacks upon start-up. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index bb5669ad61..4f64b6ad40 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -73,18 +73,6 @@ class ContainerTree: extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] return self.machines[global_stack.definition.getId()].getQualityChangesGroups(variant_names, material_bases, extruder_enabled) - ## Builds the initial container tree. - def _loadAll(self): - Logger.log("i", "Building container tree.") - start_time = time.time() - all_stacks = ContainerRegistry.getInstance().findContainerStacks() - for stack in all_stacks: - if not isinstance(stack, GlobalStack): - continue # Only want to load global stacks. We don't need to create a tree for extruder definitions. - _ = self.machines[stack.definition.getId()] # TODO: Load this lazily. - - Logger.log("d", "Building the container tree took %s seconds", time.time() - start_time) - ## Ran after completely starting up the application. def _onStartupFinished(self): JobQueue.getInstance().add(self.MachineNodeLoadJob(self)) From 9323ed5d04a63939985781518f09bdc6c5936f53 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 14:56:00 +0200 Subject: [PATCH 627/994] Add implementation of get() for the pretend-dict Some places are using this. Contributes to issue CURA-6973. --- cura/Machines/ContainerTree.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 4f64b6ad40..9e31d1ac32 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -10,7 +10,7 @@ import cura.CuraApplication # Imported like this to prevent circular dependenci from cura.Machines.MachineNode import MachineNode from cura.Settings.GlobalStack import GlobalStack # To listen only to global stacks being added. -from typing import Dict, List, TYPE_CHECKING +from typing import Dict, List, Optional, TYPE_CHECKING import time if TYPE_CHECKING: @@ -104,6 +104,21 @@ class ContainerTree: Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) return self.machines[definition_id] + ## Gets a machine node for the specified definition ID, with default. + # + # The default is returned if there is no definition with the specified + # ID. If the machine node wasn't loaded yet, this will load it lazily. + # \param definition_id The definition to look for. + # \param default The machine node to return if there is no machine + # with that definition (can be ``None`` optionally or if not + # provided). + # \return A machine node for that definition, or the default if there + # is no definition with the provided definition_id. + def get(self, definition_id: str, default: Optional[MachineNode] = None) -> Optional[MachineNode]: + if definition_id not in self: + return default + return self[definition_id] + ## Returns whether we've already cached this definition's node. # \param definition_id The definition that we may have cached. # \return ``True`` if it's cached. From c698938c60fb95ac064e1b5926425357114097d3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 15:22:52 +0200 Subject: [PATCH 628/994] Remove debug print --- cura/Settings/MachineManager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 4dc8e672aa..1bbe2ad72a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -221,8 +221,6 @@ class MachineManager(QObject): ## Triggered when the global container stack is changed in CuraApplication. def _onGlobalContainerChanged(self) -> None: - import traceback - traceback.print_stack() if self._global_container_stack: try: self._global_container_stack.containersChanged.disconnect(self._onContainersChanged) From 38e723b51cfe6ff0e8fbe3dcd4d43d43fd17d0e6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 15:32:14 +0200 Subject: [PATCH 629/994] Fix loading GlobalStacks on different thread The findContainerStacks() will list all container stacks and lazily load them. However this lazy loading is done on the thread that's calling it. The lazy loading will create GlobalStack objects, which are QObjects. The QML code then can't access those QObjects because they are created on different threads. So now instead we'll do the find query on the main thread but all the rest on the background thread. Contributes to issue CURA-6973. --- cura/Machines/ContainerTree.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 9e31d1ac32..4793945863 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -16,6 +16,7 @@ import time if TYPE_CHECKING: from cura.Machines.QualityGroup import QualityGroup from cura.Machines.QualityChangesGroup import QualityChangesGroup + from UM.Settings.ContainerStack import ContainerStack ## This class contains a look-up tree for which containers are available at @@ -75,7 +76,8 @@ class ContainerTree: ## Ran after completely starting up the application. def _onStartupFinished(self): - JobQueue.getInstance().add(self.MachineNodeLoadJob(self)) + currently_added = ContainerRegistry.getInstance().findContainerStacks() # Find all currently added global stacks. + JobQueue.getInstance().add(self.MachineNodeLoadJob(self, currently_added)) ## Dictionary-like object that contains the machines. # @@ -132,16 +134,19 @@ class ContainerTree: # \param tree_root The container tree instance. This cannot be # obtained through the singleton static function since the instance # may not yet be constructed completely. - def __init__(self, tree_root: "ContainerTree"): + # \param container_stacks All of the stacks to pre-load the container + # trees for. This needs to be provided from here because the stacks + # need to be constructed on the main thread because they are QObject. + def __init__(self, tree_root: "ContainerTree", container_stacks: List["ContainerStack"]): self.tree_root = tree_root + self.container_stacks = container_stacks super().__init__() ## Starts the background task. # # The ``JobQueue`` will schedule this on a different thread. def run(self) -> None: - currently_added = ContainerRegistry.getInstance().findContainerStacks() # Find all currently added global stacks. - for stack in currently_added: + for stack in self.container_stacks: time.sleep(0.5) if not isinstance(stack, GlobalStack): continue From c8d65e86f18b89264050a4b51b7246842bbc22be Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 10 Oct 2019 15:36:14 +0200 Subject: [PATCH 630/994] Truncate/elide/ellipsize the material name in Preferences if it doesn't fit it's parent CURA-6862 --- resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml index b54af103fe..e821dfb955 100644 --- a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml +++ b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml @@ -64,8 +64,10 @@ Item height: childrenRect.height Label { + width: parent.width text: materialProperties.name font: UM.Theme.getFont("large_bold") + elide: Text.ElideRight } } From ab4fade01764660589c86a5b19a0825cb1e8e2b4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 15:36:19 +0200 Subject: [PATCH 631/994] Fix check if definition with ID exists It's not an InstanceContainer but a DefinitionContainer. Also, when checking with the ID, it'll short circuit to the dictionary look up by ID. Then it's faster to directly check without specifying what type of container it is to prevent another nested function call. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 4793945863..2901ee29a4 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -91,7 +91,7 @@ class ContainerTree: # \param definition_id The definition to look for. # \return Whether or not a printer definition exists with that name. def __contains__(self, definition_id: str) -> bool: - return len(ContainerRegistry.getInstance().findInstanceContainersMetadata(id = definition_id)) == 0 + return len(ContainerRegistry.getInstance().findContainersMetadata(id = definition_id)) == 0 ## Returns a machine node for the specified definition ID. # From d3a3be832fe5e0279b39520b801be6c22698e8b3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 16:02:13 +0200 Subject: [PATCH 632/994] Fix QML errors when extruder list is temporarily 0 Found during work on CURA-6793. --- resources/qml/Menus/MaterialMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index a574e240d3..94a5262b72 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -13,8 +13,8 @@ Menu title: catalog.i18nc("@label:category menu label", "Material") property int extruderIndex: 0 - property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] - property string activeMaterialId: Cura.MachineManager.activeMachine.extruderList[extruderIndex].material.id + property var currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] + property string activeMaterialId: Cura.MachineManager.activeMachine.extruderList[extruderIndex] ? Cura.MachineManager.activeMachine.extruderList[extruderIndex].material.id : "" property bool updateModels: true Cura.FavoriteMaterialsModel { From 22d874d932e4fb9ee39ff7fea04347bfa9fedf82 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 16:02:47 +0200 Subject: [PATCH 633/994] Code style Found during work on CURA-6973. --- tests/Machines/TestContainerTree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 6458f0f429..9a088cc80c 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -37,7 +37,7 @@ def application(): def test_containerTreeInit(container_registry): - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() assert "machine_1" in container_tree.machines @@ -45,7 +45,7 @@ def test_containerTreeInit(container_registry): def test_newMachineAdded(container_registry): - mocked_definition_container = MagicMock(spec=DefinitionContainer) + mocked_definition_container = MagicMock(spec = DefinitionContainer) mocked_definition_container.getId = MagicMock(return_value = "machine_3") with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): From f6d83d7a6bcb6f76fbc96a687918fa5cf0668f3f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Oct 2019 16:10:19 +0200 Subject: [PATCH 634/994] Fix sign of __contains__ Should've been the other way around! Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 2901ee29a4..788f30e9e1 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -91,7 +91,7 @@ class ContainerTree: # \param definition_id The definition to look for. # \return Whether or not a printer definition exists with that name. def __contains__(self, definition_id: str) -> bool: - return len(ContainerRegistry.getInstance().findContainersMetadata(id = definition_id)) == 0 + return len(ContainerRegistry.getInstance().findContainersMetadata(id = definition_id)) > 0 ## Returns a machine node for the specified definition ID. # From faf50a301c88256153e835c5afc16db4bae26573 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Thu, 10 Oct 2019 10:09:49 -0600 Subject: [PATCH 635/994] Overwrite prime_tower_position_* value not default_value The default value here would not be used. Override must be `value` not `default_value` solves #6491 for BIBO but other printers may also be affected by #6491. --- resources/definitions/bibo2_dual.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index dbfb03a0c9..0197426ac6 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -85,10 +85,10 @@ "default_value": 2 }, "prime_tower_position_x": { - "default_value": 50 + "value": "50" }, "prime_tower_position_y": { - "default_value": 50 + "value": "50" } } } From 05a6c9c3cf16d3e8c4b6c7be7554be4c4685d192 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Oct 2019 11:04:16 +0200 Subject: [PATCH 636/994] Make code a bit smarter about reusing ExtruderConfigurationModels This prevents a lot of unneeded signal noise --- cura/PrinterOutput/Models/MaterialOutputModel.py | 8 ++++++++ cura/Settings/MachineManager.py | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index 7a17ef3cce..3714824a89 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -34,3 +34,11 @@ class MaterialOutputModel(QObject): @pyqtProperty(str, constant = True) def name(self) -> str: return self._name + + def __eq__(self, other): + if self is other: + return True + if type(other) is not MaterialOutputModel: + return False + + return self.guid == other.guid and self.type == other.type and self.brand == other.brand and self.color == other.color and self.name == other.name diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3fb55c0e70..19ba83032b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -182,9 +182,11 @@ class MachineManager(QObject): # Create the configuration model with the current data in Cura self._current_printer_configuration.printerType = self._global_container_stack.definition.getName() - self._current_printer_configuration.extruderConfigurations = [] - for extruder in self._global_container_stack.extruderList: - extruder_configuration = ExtruderConfigurationModel() + + if len(self._current_printer_configuration.extruderConfigurations) != len(self._global_container_stack.extruderList): + self._current_printer_configuration.extruderConfigurations = [ExtruderConfigurationModel() for extruder in self._global_container_stack.extruderList] + + for extruder, extruder_configuration in zip(self._global_container_stack.extruderList, self._current_printer_configuration.extruderConfigurations): # For compare just the GUID is needed at this moment mat_type = extruder.material.getMetaDataEntry("material") if extruder.material != empty_material_container else None mat_guid = extruder.material.getMetaDataEntry("GUID") if extruder.material != empty_material_container else None @@ -196,7 +198,6 @@ class MachineManager(QObject): extruder_configuration.position = int(extruder.getMetaDataEntry("position")) extruder_configuration.material = material_model extruder_configuration.hotendID = extruder.variant.getName() if extruder.variant != empty_variant_container else None - self._current_printer_configuration.extruderConfigurations.append(extruder_configuration) # An empty build plate configuration from the network printer is presented as an empty string, so use "" for an # empty build plate. From be675d93430150981a6da350ca28e495070d509d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Oct 2019 14:33:08 +0200 Subject: [PATCH 637/994] Remove unused signal --- cura/Machines/MachineErrorChecker.py | 1 - cura/Settings/MachineManager.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index cfeeb630df..4c6ed891b1 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -58,7 +58,6 @@ class MachineErrorChecker(QObject): # Whenever the machine settings get changed, we schedule an error check. self._machine_manager.globalContainerChanged.connect(self.startErrorCheck) - self._machine_manager.globalValueChanged.connect(self.startErrorCheck) self._onMachineChanged() diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 19ba83032b..4be019df8e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -95,7 +95,6 @@ class MachineManager(QObject): extruder_manager.activeExtruderChanged.connect(self.activeQualityChanged) self.globalContainerChanged.connect(self.activeStackChanged) - self.globalValueChanged.connect(self.activeStackValueChanged) ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeStackChanged) self.activeStackChanged.connect(self.activeStackValueChanged) @@ -143,7 +142,6 @@ class MachineManager(QObject): activeStackChanged = pyqtSignal() # Emitted whenever the active stack is changed (ie: when changing between extruders, changing a profile, but not when changing a value) extruderChanged = pyqtSignal() - globalValueChanged = pyqtSignal() # Emitted whenever a value inside global container is changed. activeStackValueChanged = pyqtSignal() # Emitted whenever a value inside the active stack is changed. activeStackValidationChanged = pyqtSignal() # Emitted whenever a validation inside active container is changed stacksValidationChanged = pyqtSignal() # Emitted whenever a validation is changed From bba43fafccb6a1bab86b50df94fe7c843072f6cc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Oct 2019 14:35:44 +0200 Subject: [PATCH 638/994] Remove another unused signal --- cura/Settings/MachineManager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 4be019df8e..1fadcf01c5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -154,7 +154,6 @@ class MachineManager(QObject): printerConnectedStatusChanged = pyqtSignal() # Emitted every time the active machine change or the outputdevices change rootMaterialChanged = pyqtSignal() - discoveredPrintersChanged = pyqtSignal() def setInitialActiveMachine(self) -> None: active_machine_id = self._application.getPreferences().getValue("cura/active_machine") From fbf583b577667d8800ca054d6f73ccf477ee9b3f Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Fri, 11 Oct 2019 15:27:46 +0200 Subject: [PATCH 639/994] Update strateo3d.def.json --- resources/definitions/strateo3d.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index b4b9f224ab..6e02f882c3 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -51,14 +51,14 @@ "machine_acceleration": { "default_value": 1500 }, "acceleration_enabled": { "value": false }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1500 / 1500)" }, - "acceleration_print": { "value": "1500" }, + "acceleration_print": { "value": "machine_acceleration" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, "acceleration_support": { "value": "acceleration_print" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1500)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 1500)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / 1500)" }, + "acceleration_travel": { "value": "acceleration_print" }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, "adaptive_layer_height_variation": { "default_value": 0.1 }, "adaptive_layer_height_variation_step": { "default_value": 0.05 }, "adhesion_type": { "default_value": "skirt" }, From 4277ede64f56bcbcb1e8dc9a411f7b9a7727bdf6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Mon, 14 Oct 2019 01:01:19 +0200 Subject: [PATCH 640/994] Fix 1/2 of the duplication material bug. The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong. This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed. part of CURA-6863 --- cura/Machines/VariantNode.py | 11 +++++------ resources/qml/Preferences/Materials/MaterialsList.qml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index fa0c61bd3d..a9a6608d27 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -1,6 +1,5 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - from typing import Optional, TYPE_CHECKING from UM.Logger import Logger @@ -111,18 +110,18 @@ class VariantNode(ContainerNode): if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. if material_definition != "fdmprinter" and material_definition != self.machine.container_id: return - material_variant = container.getMetaDataEntry("variant_name", "empty") - if material_variant != "empty" and material_variant != self.variant_name: + material_variant = container.getMetaDataEntry("variant_name") + if material_variant is not None and material_variant != self.variant_name: return else: # We already have this base profile. Replace the base profile if the new one is more specific. new_definition = container.getMetaDataEntry("definition") if new_definition == "fdmprinter": return # Just as unspecific or worse. - if new_definition != self.machine.container_id: + material_variant = container.getMetaDataEntry("variant_name") + if new_definition != self.machine.container_id or material_variant != self.variant_name: return # Doesn't match this set-up. original_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.materials[base_file].container_id)[0] - original_variant = original_metadata.get("variant_name", "empty") - if original_variant != "empty" or container.getMetaDataEntry("variant_name", "empty") == "empty": + if "variant_name" in original_metadata or material_variant is not None: return # Original was already specific or just as unspecific as the new one. if "empty_material" in self.materials: diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml index 96f6730029..8b82a87820 100644 --- a/resources/qml/Preferences/Materials/MaterialsList.qml +++ b/resources/qml/Preferences/Materials/MaterialsList.qml @@ -114,7 +114,7 @@ Item if (base.toActivateNewMaterial) { var position = Cura.ExtruderManager.activeExtruderIndex - Cura.MachineManager.setMaterial(position, base.currentItem.container_node) + Cura.MachineManager.setMaterialById(position, base.newRootMaterialIdToSwitchTo) } base.newRootMaterialIdToSwitchTo = "" base.toActivateNewMaterial = false From 09dc6ae44aece0c3b4c33d98c87a1e767eb83a4d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Mon, 14 Oct 2019 01:03:41 +0200 Subject: [PATCH 641/994] Scouting: Try not to spam signals or errors as much. nominally part of CURA-6863 --- cura/PrinterOutput/Models/ExtruderConfigurationModel.py | 7 ++++--- .../qml/Preferences/Materials/MaterialsTypeSection.qml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index 04a3c95afd..4a1cf4916f 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -25,9 +25,10 @@ class ExtruderConfigurationModel(QObject): return self._position def setMaterial(self, material: Optional[MaterialOutputModel]) -> None: - if self._material != material: - self._material = material - self.extruderConfigurationChanged.emit() + if material is None or self._material == material: + return + self._material = material + self.extruderConfigurationChanged.emit() @pyqtProperty(QObject, fset = setMaterial, notify = extruderConfigurationChanged) def activeMaterial(self) -> Optional[MaterialOutputModel]: diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 2c1e2128e1..3c36e12651 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -21,6 +21,7 @@ Item property var colorsModel: materialType != null ? materialType.colors: null height: childrenRect.height width: parent.width + anchors.left: parent.left Rectangle { id: material_type_header_background From 4cb59b54545c4e4894d96a73cf85f13b83f02203 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 14 Oct 2019 11:02:43 +0200 Subject: [PATCH 642/994] Fix overriding of prime tower position We had changed it for all printers back when we changed the prime tower position to a formula, but since then we've been getting new printer definitions that were made from templates floating around with the old structure. We should really have an automated test for this. Discovered during review of #6518. --- resources/definitions/Mark2_for_Ultimaker2.def.json | 4 ++-- resources/definitions/builder_premium_large.def.json | 4 ++-- resources/definitions/builder_premium_medium.def.json | 4 ++-- resources/definitions/builder_premium_small.def.json | 4 ++-- resources/definitions/cartesio.def.json | 4 ++-- resources/definitions/raise3D_N2_dual.def.json | 4 ++-- resources/definitions/raise3D_N2_plus_dual.def.json | 4 ++-- resources/definitions/raise3D_N2_plus_single.def.json | 4 ++-- resources/definitions/raise3D_N2_single.def.json | 4 ++-- resources/definitions/ultimaker_s3.def.json | 4 ++-- resources/definitions/ultimaker_s5.def.json | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 5aada425fd..b02dc78adf 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -209,10 +209,10 @@ "enabled": false }, "prime_tower_position_x": { - "default_value": 185 + "value": "185" }, "prime_tower_position_y": { - "default_value": 160 + "value": "160" }, "machine_disallowed_areas": { "default_value": [ diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index 3ceae8d63f..d100cd1ba9 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -50,8 +50,8 @@ "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, "speed_wall_x": { "value": "speed_wall" }, - "prime_tower_position_x": { "default_value": 175 }, - "prime_tower_position_y": { "default_value": 178 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_min_volume": { "default_value": 50 }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 5f608ba2a8..16aeeffdae 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -50,8 +50,8 @@ "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, "speed_wall_x": { "value": "speed_wall" }, - "prime_tower_position_x": { "default_value": 175 }, - "prime_tower_position_y": { "default_value": 178 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_min_volume": { "default_value": 50 }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index a19773ec05..290e79660f 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -49,8 +49,8 @@ "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, "speed_wall_x": { "value": "speed_wall" }, - "prime_tower_position_x": { "default_value": 175 }, - "prime_tower_position_y": { "default_value": 178 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_min_volume": { "default_value": 50 }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 4ed1a9f2d9..e7a005682d 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -44,8 +44,8 @@ "prime_tower_enable": { "default_value": false }, "prime_tower_min_volume": { "value": "0.7" }, "prime_tower_size": { "value": 24.0 }, - "prime_tower_position_x": { "value": 125 }, - "prime_tower_position_y": { "value": 70 }, + "prime_tower_position_x": { "value": "125" }, + "prime_tower_position_y": { "value": "70" }, "prime_blob_enable": { "default_value": false }, "machine_max_feedrate_z": { "default_value": 20 }, "machine_disallowed_areas": { "default_value": [ diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index 1994cc2bcb..530ad79d19 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -76,10 +76,10 @@ "default_value": 2 }, "prime_tower_position_x": { - "default_value": 195 + "value": "195" }, "prime_tower_position_y": { - "default_value": 149 + "value": "149" } } } diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index 23ad1fbd09..ffc4afec16 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -76,10 +76,10 @@ "default_value": 2 }, "prime_tower_position_x": { - "default_value": 195 + "value": "195" }, "prime_tower_position_y": { - "default_value": 149 + "value": "149" } } } diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index f8a1a7e0fb..ccb169efb1 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -72,10 +72,10 @@ "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, "prime_tower_position_x": { - "default_value": 195 + "value": "195" }, "prime_tower_position_y": { - "default_value": 149 + "value": "149" } } } diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index c69823466b..f0915d1a31 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -72,10 +72,10 @@ "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, "prime_tower_position_x": { - "default_value": 195 + "value": "195" }, "prime_tower_position_y": { - "default_value": 149 + "value": "149" } } } diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index f7f3a038fe..0d6834521e 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -68,8 +68,8 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "default_value": 345 }, - "prime_tower_position_y": { "default_value": 222.5 }, + "prime_tower_position_x": { "value": "345" }, + "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index fef8c87c27..dfa8da5397 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -70,8 +70,8 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "default_value": 345 }, - "prime_tower_position_y": { "default_value": 222.5 }, + "prime_tower_position_x": { "value": "345" }, + "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": From 26a7de5a27d795c229a3a3b09fb0d87ad62176e0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Mon, 14 Oct 2019 11:02:58 +0200 Subject: [PATCH 643/994] Fix boolean check. part of CURA-6863 --- cura/Machines/VariantNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index a9a6608d27..2fdc847a0a 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -121,7 +121,7 @@ class VariantNode(ContainerNode): if new_definition != self.machine.container_id or material_variant != self.variant_name: return # Doesn't match this set-up. original_metadata = ContainerRegistry.getInstance().findContainersMetadata(id = self.materials[base_file].container_id)[0] - if "variant_name" in original_metadata or material_variant is not None: + if "variant_name" in original_metadata or material_variant is None: return # Original was already specific or just as unspecific as the new one. if "empty_material" in self.materials: From c147174668ffeb6b5af7b05ffd494361db923fc1 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 14 Oct 2019 11:04:28 +0200 Subject: [PATCH 644/994] Limit profile name to 70% of available width for CustomPrintSetup This leaves 30% for the variant detail info CURA-6862 --- .../Custom/CustomPrintSetup.qml | 122 +++++++++++------- 1 file changed, 77 insertions(+), 45 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 2698089d0c..b72341a4d6 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -4,6 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Controls 1.4 as OldControls +import QtQuick.Layouts 1.3 import UM 1.3 as UM import Cura 1.6 as Cura @@ -66,7 +67,6 @@ Item { id: intentSelection onClicked: menu.opened ? menu.close() : menu.open() - text: generateActiveQualityText() anchors.right: parent.right width: UM.Theme.getSize("print_setup_big_item").width @@ -75,18 +75,85 @@ Item baselineOffset: null // If we don't do this, there is a binding loop. WHich is a bit weird, since we override the contentItem anyway... - contentItem: Label + + contentItem: RowLayout { - id: textLabel - text: intentSelection.text - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") + spacing: 0 anchors.left: parent.left + anchors.right: customisedSettings.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: intentSelection.verticalCenter - height: contentHeight - verticalAlignment: Text.AlignVCenter - renderType: Text.NativeRendering + + + + Label + { + id: textLabel + text: qualityName() + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + anchors.verticalCenter: intentSelection.verticalCenter + Layout.margins: 0 + Layout.maximumWidth: parent.width * 0.7 + height: contentHeight + verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering + elide: Text.ElideRight + + function qualityName() { + var resultMap = Cura.MachineManager.activeQualityDisplayNameMap + return resultMap["main"] + } + } + + Label + { + text: activeQualityDetailText() + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text_detail") + anchors.verticalCenter: intentSelection.verticalCenter + Layout.margins: 0 + Layout.fillWidth: true + + height: contentHeight + verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering + elide: Text.ElideRight + + function activeQualityDetailText() + { + var resultMap = Cura.MachineManager.activeQualityDisplayNameMap + var resultSuffix = resultMap["suffix"] + var result = "" + + if (Cura.MachineManager.isActiveQualityExperimental) + { + resultSuffix += " (Experimental)" + } + + if (Cura.MachineManager.isActiveQualitySupported) + { + if (Cura.MachineManager.activeQualityLayerHeight > 0) + { + if (resultSuffix) + { + result += " - " + } + if (resultSuffix) + { + result += resultSuffix + } + result += " - " + result += Cura.MachineManager.activeQualityLayerHeight + "mm" + } + } + + return result + } + } + + + + } background: Rectangle @@ -98,41 +165,6 @@ Item color: UM.Theme.getColor("main_background") } - function generateActiveQualityText() - { - var resultMap = Cura.MachineManager.activeQualityDisplayNameMap - var resultMain = resultMap["main"] - var resultSuffix = resultMap["suffix"] - var result = "" - - if (Cura.MachineManager.isActiveQualityExperimental) - { - resultSuffix += " (Experimental)" - } - - if (Cura.MachineManager.isActiveQualitySupported) - { - if (Cura.MachineManager.activeQualityLayerHeight > 0) - { - result = resultMain - if (resultSuffix) - { - result += " - " - } - result += "" - if (resultSuffix) - { - result += resultSuffix - } - result += " - " - result += Cura.MachineManager.activeQualityLayerHeight + "mm" - result += "" - } - } - - return result - } - UM.SimpleButton { id: customisedSettings From 279d5671d8a7ff53477a6b9fb002d3f8d1b183a3 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 14 Oct 2019 12:14:31 +0200 Subject: [PATCH 645/994] Cleanup CustomPrintSetup.qml CURA-6862 --- .../PrintSetupSelector/Custom/CustomPrintSetup.qml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index b72341a4d6..cf27d6d023 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -91,7 +91,6 @@ Item text: qualityName() font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") - anchors.verticalCenter: intentSelection.verticalCenter Layout.margins: 0 Layout.maximumWidth: parent.width * 0.7 height: contentHeight @@ -110,7 +109,6 @@ Item text: activeQualityDetailText() font: UM.Theme.getFont("default") color: UM.Theme.getColor("text_detail") - anchors.verticalCenter: intentSelection.verticalCenter Layout.margins: 0 Layout.fillWidth: true @@ -136,11 +134,7 @@ Item { if (resultSuffix) { - result += " - " - } - if (resultSuffix) - { - result += resultSuffix + result += " - " + resultSuffix } result += " - " result += Cura.MachineManager.activeQualityLayerHeight + "mm" @@ -150,10 +144,6 @@ Item return result } } - - - - } background: Rectangle From dd8f6dc10e7b9ab6d263d168ef389d1eed44b7f0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 14 Oct 2019 12:22:15 +0200 Subject: [PATCH 646/994] Fix ContainerTree reacting to duplicating materials CURA-6863 --- cura/Machines/Models/MaterialManagementModel.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index b4f3bb9889..6f6f3906b8 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -128,6 +128,20 @@ class MaterialManagementModel(QObject): new_container.getMetaData().update(new_metadata) new_containers.append(new_container) + # CURA-6863: Nodes in ContainerTree will be updated upon ContainerAdded signals, one at a time. It will use the + # best fit material container at the time it sees one. For example, if you duplicate and get generic_pva #2, + # if the node update function sees the containers in the following order: + # + # - generic_pva #2 + # - generic_pva #2_um3_aa04 + # + # It will first use "generic_pva #2" because that's the best fit it has ever seen, and later "generic_pva #2_um3_aa04" + # once it sees that. Because things run in the Qt event loop, they don't happen at the same time. This means if + # between those two events, the ContainerTree will have nodes that contain invalid data. + # + # This sort fixes the problem by emitting the most specific containers first. + new_containers = sorted(new_containers, key = lambda x: x.getId(), reverse = True) + for container_to_add in new_containers: container_to_add.setDirty(True) container_registry.addContainer(container_to_add) From cc64fb0a936b250e37f96bc798d5ebadf6ef29b0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 14 Oct 2019 14:15:03 +0200 Subject: [PATCH 647/994] Fix variant handling in VariantNode CURA-6863 --- cura/Machines/VariantNode.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index c1297651bd..ef8981a3c2 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -6,9 +6,13 @@ from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal + +from cura.Settings.cura_empty_instance_containers import empty_variant_container from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode + import UM.FlameProfiler + if TYPE_CHECKING: from typing import Dict from cura.Machines.MachineNode import MachineNode @@ -110,8 +114,8 @@ class VariantNode(ContainerNode): if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. if material_definition != "fdmprinter" and material_definition != self.machine.container_id: return - material_variant = container.getMetaDataEntry("variant_name") - if material_variant is not None and material_variant != self.variant_name: + material_variant = container.getMetaDataEntry("variant_name", empty_variant_container.getName()) + if material_variant != self.variant_name: return else: # We already have this base profile. Replace the base profile if the new one is more specific. new_definition = container.getMetaDataEntry("definition") From 8f668091598f684f5d37f6ab324760266c341af8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 14 Oct 2019 14:33:50 +0200 Subject: [PATCH 648/994] Always show custom qualities CURA-6882 --- cura/Machines/MachineNode.py | 11 +++-------- .../PrintSetupSelector/Custom/CustomPrintSetup.qml | 5 +++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index e71801fbb1..29968512ce 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -134,6 +134,9 @@ class MachineNode(ContainerNode): groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], intent_category = quality_changes.get("intent_category", "default"), parent = CuraApplication.getInstance()) + # CURA-6882 + # Custom qualities are always available, even if they are based on the "not supported" profile. + groups_by_name[name].is_available = True elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") @@ -142,14 +145,6 @@ class MachineNode(ContainerNode): else: # Global profile. groups_by_name[name].metadata_for_global = quality_changes - quality_groups = self.getQualityGroups(variant_names, material_bases, extruder_enabled) - for quality_changes_group in groups_by_name.values(): - if quality_changes_group.quality_type not in quality_groups: - quality_changes_group.is_available = False - else: - # Quality changes group is available iff the quality group it depends on is available. Irrespective of whether the intent category is available. - quality_changes_group.is_available = quality_groups[quality_changes_group.quality_type].is_available - return list(groups_by_name.values()) ## Gets the preferred global quality node, going by the preferred quality diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 2698089d0c..99fdafdb73 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -110,6 +110,11 @@ Item resultSuffix += " (Experimental)" } + if (Cura.MachineManager.isActiveQualityCustom) + { + result = resultMain + } + if (Cura.MachineManager.isActiveQualitySupported) { if (Cura.MachineManager.activeQualityLayerHeight > 0) From 2e0fd21c60aa587c4de906485961239a37618b6a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 14 Oct 2019 14:47:43 +0200 Subject: [PATCH 649/994] Fix setVariantByName() --- cura/Settings/MachineManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1fadcf01c5..dec433e8f8 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1514,7 +1514,8 @@ class MachineManager(QObject): if self._global_container_stack is None: return machine_definition_id = self._global_container_stack.definition.id - variant_node = self._variant_manager.getVariantNode(machine_definition_id, variant_name) + machine_node = ContainerTree.getInstance().machines.get(machine_definition_id) + variant_node = machine_node.variants.get(variant_name) self.setVariant(position, variant_node) @pyqtSlot(str, "QVariant") From 54f7892f2d85ba0ff76eb7f82b002527cdb8ac0a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 14 Oct 2019 15:25:28 +0200 Subject: [PATCH 650/994] Sort built-in qualities by layer height for all CURA-6883 --- cura/Machines/Models/QualityManagementModel.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index adaa4309b7..1d30b1753e 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -13,6 +13,7 @@ from cura.Settings.ContainerManager import ContainerManager from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container from cura.Settings.IntentManager import IntentManager +from cura.Machines.Models.MachineModelUtils import fetchLayerHeight from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -295,6 +296,8 @@ class QualityManagementModel(ListModel): if not quality_group.is_available: continue + layer_height = fetchLayerHeight(quality_group) + item = {"name": quality_group.name, "is_read_only": True, "quality_group": quality_group, @@ -302,10 +305,11 @@ class QualityManagementModel(ListModel): "quality_changes_group": None, "intent_category": "default", "section_name": catalog.i18nc("@label", "Default"), + "layer_height": layer_height, # layer_height is only used for sorting } item_list.append(item) - # Sort by quality names - item_list = sorted(item_list, key = lambda x: x["name"].upper()) + # Sort by layer_height for built-in qualities + item_list = sorted(item_list, key = lambda x: x["layer_height"]) # Create intent items (non-default) available_intent_list = IntentManager.getInstance().getCurrentAvailableIntents() From 096b6431c5c253bc33cc1492b3fd88b02d79e5e0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 14 Oct 2019 14:36:07 +0200 Subject: [PATCH 651/994] Fix typos in g-code comments --- resources/definitions/creality_base.def.json | 2 +- resources/definitions/creality_ender5.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index d7e028f31a..7e91fb4989 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -125,7 +125,7 @@ "overrides": { "machine_name": { "default_value": "Creawsome Base Printer" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index d95f4a1467..c1511884ae 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -4,7 +4,7 @@ "inherits": "creality_base", "overrides": { "machine_name": { "default_value": "Creality Ender-5" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, From 577365cf968a78767a8b45f843f924e8e221191a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 08:19:32 +0200 Subject: [PATCH 652/994] Fx containerAdded handling in VariantNode CURA-6889 --- cura/Machines/VariantNode.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 27e359afb1..efe15dbec2 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -101,6 +101,14 @@ class VariantNode(ContainerNode): def _materialAdded(self, container: ContainerInterface) -> None: if container.getMetaDataEntry("type") != "material": return # Not interested. + if not ContainerRegistry.getInstance().findContainersMetadata(id = container.getId()): + # CURA-6889 + # containerAdded and removed signals may be triggered in the next event cycle. If a container gets added + # and removed in the same event cycle, in the next cycle, the connections should just ignore the signals. + # The check here makes sure that the container in the signal still exists. + Logger.log("d", "Got container added signal for container [%s] but it no longer exists, do nothing.", + container.getId()) + return if not self.machine.has_materials: return # We won't add any materials. material_definition = container.getMetaDataEntry("definition") From 84080b675b7b5ac1377fc1ec287eb2bb59b75529 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 08:29:53 +0200 Subject: [PATCH 653/994] Fix tests --- tests/Machines/TestVariantNode.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 71257bd972..4e58069be3 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -104,10 +104,11 @@ def test_variantNodeInit_excludedMaterial(container_registry, machine_node): def test_materialAdded(container_registry, machine_node, metadata, material_result_list): variant_node = createVariantNode("machine_1", machine_node, container_registry) machine_node.exclude_materials = ["material_3"] - with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. - with patch.dict(metadata_dict, metadata): - mocked_container = createMockedInstanceContainer() - variant_node._materialAdded(mocked_container) + with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): + with patch("cura.Machines.VariantNode.MaterialNode"): # We're not testing the material node here, so patch it out. + with patch.dict(metadata_dict, metadata): + mocked_container = createMockedInstanceContainer() + variant_node._materialAdded(mocked_container) assert len(material_result_list) == len(variant_node.materials) for name in material_result_list: From ca21268a121f2d26312156e287d3a3b2874ab031 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 15 Oct 2019 10:26:52 +0200 Subject: [PATCH 654/994] Elide the profile text in the middle for the PrintSetupSelector. This makes sure that at least some part of the name and some part of the variant details (qualityy, diameter) is visible CURA-6862 --- resources/qml/IconWithText.qml | 1 + resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml index 24b6dc7fe2..b9fe873b25 100644 --- a/resources/qml/IconWithText.qml +++ b/resources/qml/IconWithText.qml @@ -19,6 +19,7 @@ Item property alias color: label.color property alias text: label.text property alias font: label.font + property alias elide: label.elide property real margin: UM.Theme.getSize("narrow_margin").width // These properties can be used in combination with layouts. diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index a23b87fdbe..1a15980693 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -37,6 +37,7 @@ RowLayout return "" } font: UM.Theme.getFont("medium") + elide: Text.ElideMiddle UM.SettingPropertyProvider { From 71701f15cf9c271d9f77a2055e710fc4417cb503 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 15 Oct 2019 11:38:51 +0200 Subject: [PATCH 655/994] Remove function to reintroduce binding. Also force max width to integer value and comment why there is a plain value like 0.7 in the code. part of CURA-6862 --- .../qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index cf27d6d023..b559aa711c 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -88,20 +88,15 @@ Item Label { id: textLabel - text: qualityName() + text: Cura.MachineManager.activeQualityDisplayNameMap["main"] font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") Layout.margins: 0 - Layout.maximumWidth: parent.width * 0.7 + Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row. height: contentHeight verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering elide: Text.ElideRight - - function qualityName() { - var resultMap = Cura.MachineManager.activeQualityDisplayNameMap - return resultMap["main"] - } } Label From 36aab5d56bda56a7edb3c1ea4156a693f33d7f26 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 13:04:20 +0200 Subject: [PATCH 656/994] Fix removeMaterials() and optimization CURA-6886 --- .../Models/MaterialManagementModel.py | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index b4f3bb9889..a494e35c89 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -8,6 +8,7 @@ import uuid # To generate new GUIDs for new materials. from UM.i18n import i18nCatalog from UM.Logger import Logger +from UM.Signal import postponeSignals, CompressTechnique import cura.CuraApplication # Imported like this to prevent circular imports. from cura.Machines.ContainerTree import ContainerTree @@ -73,8 +74,20 @@ class MaterialManagementModel(QObject): def removeMaterial(self, material_node: "MaterialNode") -> None: container_registry = CuraContainerRegistry.getInstance() materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file) - for material_metadata in materials_this_base_file: - container_registry.removeContainer(material_metadata["id"]) + + # The material containers belonging to the same material file are supposed to work together. This postponeSignals() + # does two things: + # - optimizing the signal emitting. + # - making sure that the signals will only be emitted after all the material containers have been removed. + with postponeSignals(container_registry.containerRemoved, compress = CompressTechnique.CompressPerParameterValue): + # CURA-6886: Some containers may not have been loaded. If remove one material container, its material file + # will be removed. If later we remove a sub-material container which hasn't been loaded previously, it will + # crash because removeContainer() requires to load the container first, but the material file was already + # gone. + for material_metadata in materials_this_base_file: + container_registry.findInstanceContainers(id = material_metadata["id"]) + for material_metadata in materials_this_base_file: + container_registry.removeContainer(material_metadata["id"]) ## Creates a duplicate of a material with the same GUID and base_file # metadata. @@ -128,15 +141,17 @@ class MaterialManagementModel(QObject): new_container.getMetaData().update(new_metadata) new_containers.append(new_container) - for container_to_add in new_containers: - container_to_add.setDirty(True) - container_registry.addContainer(container_to_add) + # Optimization. Serving the same purpose as the postponeSignals() in removeMaterial() + with postponeSignals(container_registry.containerAdded, compress=CompressTechnique.CompressPerParameterValue): + for container_to_add in new_containers: + container_to_add.setDirty(True) + container_registry.addContainer(container_to_add) - # If the duplicated material was favorite then the new material should also be added to the favorites. - favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";")) - if base_file in favorites_set: - favorites_set.add(new_base_id) - application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set)) + # If the duplicated material was favorite then the new material should also be added to the favorites. + favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";")) + if base_file in favorites_set: + favorites_set.add(new_base_id) + application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set)) return new_base_id From e5450a449cd32f98387082ddc4aac31a0a4890a2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 13:27:29 +0200 Subject: [PATCH 657/994] IntentManager should take into account disabled extruders CURA-6891 --- cura/Settings/IntentManager.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 9f9d174ffa..c1d59fb84a 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -78,6 +78,8 @@ class IntentManager(QObject): final_intent_ids = set() # type: Set[str] current_definition_id = global_stack.definition.getId() for extruder_stack in global_stack.extruderList: + if not extruder_stack.isEnabled: + continue nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata.get("quality_type") in available_quality_types} @@ -104,6 +106,8 @@ class IntentManager(QObject): current_definition_id = global_stack.definition.getId() final_intent_categories = set() # type: Set[str] for extruder_stack in global_stack.extruderList: + if not extruder_stack.isEnabled: + continue nozzle_name = extruder_stack.variant.getMetaDataEntry("name") material_id = extruder_stack.material.getMetaDataEntry("base_file") final_intent_categories.update(self.intentCategories(current_definition_id, nozzle_name, material_id)) From fe8b7a48e6c4e7d4dc05d21f417a9968bef73cb3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 14:22:38 +0200 Subject: [PATCH 658/994] Fix QualityManagementModel update CURA-6883 --- cura/Machines/Models/QualityManagementModel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 1d30b1753e..d5a35d8eab 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -54,6 +54,10 @@ class QualityManagementModel(ListModel): self._extruder_manager = application.getExtruderManager() self._machine_manager.globalContainerChanged.connect(self._update) + self._machine_manager.activeQualityGroupChanged.connect(self._update) + self._machine_manager.activeStackChanged.connect(self._update) + self._machine_manager.extruderChanged.connect(self._update) + container_registry.containerAdded.connect(self._qualityChangesListChanged) container_registry.containerRemoved.connect(self._qualityChangesListChanged) container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) From 845cab557317f5bc200c2b16e786634566839c3e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 15 Oct 2019 14:37:37 +0200 Subject: [PATCH 659/994] Clarified comment for duplicating materials --- cura/Machines/Models/MaterialManagementModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index a494e35c89..8a143f46b2 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -141,7 +141,8 @@ class MaterialManagementModel(QObject): new_container.getMetaData().update(new_metadata) new_containers.append(new_container) - # Optimization. Serving the same purpose as the postponeSignals() in removeMaterial() + # postpone the signals emitted when duplicating materials. This is easier on the event loop; changes the + # behavior to be like a transaction. Prevents concurrency issues. with postponeSignals(container_registry.containerAdded, compress=CompressTechnique.CompressPerParameterValue): for container_to_add in new_containers: container_to_add.setDirty(True) From ce4c5a1c936451758251defdcb910834484d5081 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 15 Oct 2019 15:01:45 +0200 Subject: [PATCH 660/994] Remove unnecessary listening to switching extruder tabs Also fix unnecessary emitting of switching extruder tabs. This should improve performance a lot. I tested a lot of things and am convinced that it didn't break anything. But the automated GUI tests and QA team should be the final arbiters of that... Contributes to issue CURA-6793. --- cura/BuildVolume.py | 4 ---- cura/Machines/Models/BaseMaterialsModel.py | 2 +- cura/Machines/Models/IntentCategoryModel.py | 5 ++++- cura/Machines/Models/QualityProfilesDropDownMenuModel.py | 3 ++- cura/Settings/MachineManager.py | 8 ++------ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index a640760471..bc8c806699 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -126,10 +126,6 @@ class BuildVolume(SceneNode): # Therefore this works. self._machine_manager.activeQualityChanged.connect(self._onStackChanged) - # This should also ways work, and it is semantically more correct, - # but it does not update the disallowed areas after material change - self._machine_manager.activeStackChanged.connect(self._onStackChanged) - # Enable and disable extruder self._machine_manager.extruderChanged.connect(self.updateNodeBoundaryCheck) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index fc2f90f1e4..c7dbadf54a 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -42,7 +42,7 @@ class BaseMaterialsModel(ListModel): self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack) self._updateExtruderStack() - # Update this model when switching machines, when adding materials or changing their metadata. + # Update this model when switching machines or tabs, when adding materials or changing their metadata. self._machine_manager.activeStackChanged.connect(self._update) ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged) self._application.getMaterialManagementModel().favoritesChanged.connect(self._update) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index c436f94421..da8044addd 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -48,7 +48,10 @@ class IntentCategoryModel(ListModel): ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) - cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.update) + machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() + machine_manager.activeMaterialChanged.connect(self.update) + machine_manager.activeVariantChanged.connect(self.update) + machine_manager.extruderChanged.connect(self.update) self.update() diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 9bf1cc08a8..9e1dfc4949 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -40,7 +40,8 @@ class QualityProfilesDropDownMenuModel(ListModel): application.globalContainerStackChanged.connect(self._onChange) machine_manager.activeQualityGroupChanged.connect(self._onChange) - machine_manager.activeStackChanged.connect(self._onChange) + machine_manager.activeMaterialChanged.connect(self._onChange) + machine_manager.activeVariantChanged.connect(self._onChange) machine_manager.extruderChanged.connect(self._onChange) self._layer_height_unit = "" # This is cached diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5985234442..84e5495e7f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -139,8 +139,8 @@ class MachineManager(QObject): activeVariantChanged = pyqtSignal() activeQualityChanged = pyqtSignal() activeIntentChanged = pyqtSignal() - activeStackChanged = pyqtSignal() # Emitted whenever the active extruder stack is changed (ie: when changing between extruders, changing a profile, but not when changing a value) - extruderChanged = pyqtSignal() + activeStackChanged = pyqtSignal() # Emitted whenever the active extruder stack is changed (ie: when switching the active extruder tab or changing between printers) + extruderChanged = pyqtSignal() # Emitted whenever an extruder is activated or deactivated or the default extruder changes. activeStackValueChanged = pyqtSignal() # Emitted whenever a value inside the active stack is changed. activeStackValidationChanged = pyqtSignal() # Emitted whenever a validation inside active container is changed @@ -269,11 +269,7 @@ class MachineManager(QObject): def _onActiveExtruderStackChanged(self) -> None: self.blurSettings.emit() # Ensure no-one has focus. - if self._active_container_stack is not None: - self._active_container_stack.pyqtContainersChanged.disconnect(self.activeStackChanged) # Unplug from the old one. self._active_container_stack = ExtruderManager.getInstance().getActiveExtruderStack() - if self._active_container_stack is not None: - self._active_container_stack.pyqtContainersChanged.connect(self.activeStackChanged) # Plug into the new one. def __emitChangedSignals(self) -> None: self.activeQualityChanged.emit() From 59fa73448a8a7551405ac4676b75a7c30ff15576 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 14:06:30 +0200 Subject: [PATCH 661/994] Fix material diameter change CURA-6868 --- cura/Settings/MachineManager.py | 10 +++++----- resources/qml/Preferences/Materials/MaterialsView.qml | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index dec433e8f8..35f3268cce 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1322,7 +1322,8 @@ class MachineManager(QObject): # changed. # \param position The extruder stack to update. If provided with None, all # extruder stacks will be updated. - def updateMaterialWithVariant(self, position: Optional[str]) -> None: + @pyqtSlot() + def updateMaterialWithVariant(self, position: Optional[str] = None) -> None: if self._global_container_stack is None: return if position is None: @@ -1353,10 +1354,9 @@ class MachineManager(QObject): self._setMaterial(position_item, new_material) else: # The current material is not available, find the preferred one. - if position is not None: - approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) - material_node = nozzle_node.preferredMaterial(approximate_material_diameter) - self._setMaterial(position_item, material_node) + approximate_material_diameter = int(self._global_container_stack.extruderList[int(position_item)].getApproximateMaterialDiameter()) + material_node = nozzle_node.preferredMaterial(approximate_material_diameter) + self._setMaterial(position_item, material_node) ## Given a printer definition name, select the right machine instance. In case it doesn't exist, create a new # instance with the same network key. diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 6d5a8119c5..8a5ec79d53 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -111,6 +111,8 @@ TabView { base.setMetaDataEntry("approximate_diameter", old_approximate_diameter_value, getApproximateDiameter(new_diameter_value).toString()); base.setMetaDataEntry("properties/diameter", properties.diameter, new_diameter_value); + // CURA-6868 Make sure to update the extruder to user a diameter-compatible material. + Cura.MachineManager.updateMaterialWithVariant() base.resetSelectedMaterial() } From c875252b53443d18ccd14dbe747e8561fb58c637 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 15 Oct 2019 13:24:09 +0200 Subject: [PATCH 662/994] Fix some mistakes indicated by PyCharm's linting --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 6 ++++-- plugins/USBPrinting/USBPrinterOutputDevice.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 3a25b7781a..499214a0e9 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -162,6 +162,8 @@ class PauseAtHeight(Script): # use offset to calculate the current height: = - layer_0_z = 0 current_z = 0 + current_height = 0 + current_layer = 0 current_extrusion_f = 0 got_first_g_cmd_on_layer_0 = False current_t = 0 #Tracks the current extruder for tracking the target temperature. @@ -263,8 +265,8 @@ class PauseAtHeight(Script): # the nozzle) x, y = self.getNextXY(layer) prev_lines = prev_layer.split("\n") - for line in prev_lines: - new_e = self.getValue(line, 'E', current_e) + for lin in prev_lines: + new_e = self.getValue(lin, "E", current_e) if new_e != current_e: current_e = new_e break diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index e32e4c8745..4930835f58 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -328,7 +328,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): def _setFirmwareName(self, name): new_name = re.findall(r"FIRMWARE_NAME:(.*);", str(name)) - if new_name: + if new_name: self._firmware_name = new_name[0] Logger.log("i", "USB output device Firmware name: %s", self._firmware_name) else: From f93f26444b181ec520ae7918cfcf0e68272a579a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 15 Oct 2019 15:33:41 +0200 Subject: [PATCH 663/994] Revert "Fix QualityManagementModel update" This reverts commit fe8b7a48e6c4e7d4dc05d21f417a9968bef73cb3. This commit caused Cura to crash when creating a custom quality profile. Contributes to issue CURA-6883. --- cura/Machines/Models/QualityManagementModel.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index d5a35d8eab..1d30b1753e 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -54,10 +54,6 @@ class QualityManagementModel(ListModel): self._extruder_manager = application.getExtruderManager() self._machine_manager.globalContainerChanged.connect(self._update) - self._machine_manager.activeQualityGroupChanged.connect(self._update) - self._machine_manager.activeStackChanged.connect(self._update) - self._machine_manager.extruderChanged.connect(self._update) - container_registry.containerAdded.connect(self._qualityChangesListChanged) container_registry.containerRemoved.connect(self._qualityChangesListChanged) container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) From d350c9e3d9e4991b656226ed11c26010e31608a4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 15:34:14 +0200 Subject: [PATCH 664/994] Update quality and intent models when extruders get changed CURA-6894 --- cura/Machines/Models/IntentCategoryModel.py | 12 +++++++++++- .../Models/QualityProfilesDropDownMenuModel.py | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index c436f94421..d7d1ee2710 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -46,9 +46,19 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.WeightRole, "weight") self.addRoleName(self.QualitiesRole, "qualities") + application = cura.CuraApplication.CuraApplication.getInstance() + ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) - cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.update) + + machine_manager = application.getMachineManager() + machine_manager.globalContainerChanged.connect(self.update) + machine_manager.activeQualityGroupChanged.connect(self.update) + machine_manager.activeStackChanged.connect(self.update) + machine_manager.extruderChanged.connect(self.update) + + extruder_manager = application.getExtruderManager() + extruder_manager.extrudersChanged.connect(self.update) self.update() diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 9bf1cc08a8..92ea0c205f 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -43,6 +43,9 @@ class QualityProfilesDropDownMenuModel(ListModel): machine_manager.activeStackChanged.connect(self._onChange) machine_manager.extruderChanged.connect(self._onChange) + extruder_manager = application.getExtruderManager() + extruder_manager.extrudersChanged.connect(self._onChange) + self._layer_height_unit = "" # This is cached self._update_timer = QTimer() # type: QTimer From ae6f0eb77e555c62e1c71253582e373b1c3c8dfe Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Oct 2019 15:53:27 +0200 Subject: [PATCH 665/994] Re-fix quality model update CURA-6883 --- .../Machines/Models/QualityManagementModel.py | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 1d30b1753e..3b503edcf0 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. from typing import Any, cast, Dict, Optional, TYPE_CHECKING -from PyQt5.QtCore import pyqtSlot, QObject, Qt +from PyQt5.QtCore import pyqtSlot, QObject, Qt, QTimer from UM.Logger import Logger from UM.Qt.ListModel import ListModel @@ -51,14 +51,27 @@ class QualityManagementModel(ListModel): application = cura.CuraApplication.CuraApplication.getInstance() container_registry = application.getContainerRegistry() self._machine_manager = application.getMachineManager() - self._extruder_manager = application.getExtruderManager() + self._machine_manager.activeQualityGroupChanged.connect(self._onChange) + self._machine_manager.activeStackChanged.connect(self._onChange) + self._machine_manager.extruderChanged.connect(self._onChange) + self._machine_manager.globalContainerChanged.connect(self._onChange) + + self._extruder_manager = application.getExtruderManager() + self._extruder_manager.extrudersChanged.connect(self._onChange) - self._machine_manager.globalContainerChanged.connect(self._update) container_registry.containerAdded.connect(self._qualityChangesListChanged) container_registry.containerRemoved.connect(self._qualityChangesListChanged) container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged) - self._update() + self._update_timer = QTimer() + self._update_timer.setInterval(100) + self._update_timer.setSingleShot(True) + self._update_timer.timeout.connect(self._update) + + self._onChange() + + def _onChange(self) -> None: + self._update_timer.start() ## Deletes a custom profile. It will be gone forever. # \param quality_changes_group The quality changes group representing the From ac8a7d4aeb65fe93c5984dfeb9e8405ead34cc76 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2019 09:44:09 +0200 Subject: [PATCH 666/994] Add whitespace between plugin name and licence string in license dialog --- plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml b/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml index 40b22c268d..f7edde1fff 100644 --- a/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml +++ b/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml @@ -30,7 +30,7 @@ UM.Dialog anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - text: licenseDialog.pluginName + catalog.i18nc("@label", "This plugin contains a license.\nYou need to accept this license to install this plugin.\nDo you agree with the terms below?") + text: licenseDialog.pluginName + ": " + catalog.i18nc("@label", "This plugin contains a license.\nYou need to accept this license to install this plugin.\nDo you agree with the terms below?") wrapMode: Text.Wrap renderType: Text.NativeRendering } From 86ff7443cfc5643e3dfc2ad036ca7d838862bf7d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 16 Oct 2019 10:21:48 +0200 Subject: [PATCH 667/994] Fix QML undefined errors --- resources/qml/Menus/MaterialMenu.qml | 18 +++++++++++++++--- resources/qml/Menus/NozzleMenu.qml | 8 ++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 9720c81879..edc5ee1e0d 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -14,7 +14,11 @@ Menu property int extruderIndex: 0 property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] - property string activeMaterialId: Cura.MachineManager.activeMachine.extruderList[extruderIndex].material.id + property string activeMaterialId: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] + return (extruder === undefined) ? "" : extruder.material.id + } property bool updateModels: true Cura.FavoriteMaterialsModel { @@ -73,7 +77,11 @@ Menu { text: model.name checkable: true - enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled + enabled: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] + return (extruder === undefined) ? false : extruder.isEnabled + } checked: model.root_material_id === menu.currentRootMaterialId exclusiveGroup: group onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) @@ -112,7 +120,11 @@ Menu { text: model.name checkable: true - enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled + enabled: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] + return (extruder === undefined) ? false : extruder.isEnabled + } checked: model.id === menu.activeMaterialId exclusiveGroup: group onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index a291f125eb..2734e40489 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -29,10 +29,14 @@ Menu checkable: true checked: { var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] - return extruder.variant.name == model.hotend_name + return (extruder === undefined) ? false : (extruder.variant.name == model.hotend_name) } exclusiveGroup: group - enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled + enabled: + { + var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] + return (extruder === undefined) ? false : extruder.isEnabled + } onTriggered: { Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node); } From 401390209f93b77a67245e64ba0e5787230b5ec7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 10:59:58 +0200 Subject: [PATCH 668/994] Robustness against missing approximate diameter Pretend like that material doesn't exist then. Contributes to issue CURA-6793. --- cura/Machines/Models/BaseMaterialsModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index c7dbadf54a..edcdacb8a1 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -141,7 +141,7 @@ class BaseMaterialsModel(ListModel): nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials approximate_material_diameter = extruder_stack.getApproximateMaterialDiameter() - self._available_materials = {key: material for key, material in materials.items() if float(material.container.getMetaDataEntry("approximate_diameter")) == approximate_material_diameter} + self._available_materials = {key: material for key, material in materials.items() if float(material.container.getMetaDataEntry("approximate_diameter", -1)) == approximate_material_diameter} ## This method is used by all material models in the beginning of the # _update() method in order to prevent errors. It's the same in all models From 9f84304829f88d5932031712de5c92eea684f777 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 12:56:05 +0200 Subject: [PATCH 669/994] Defensive against missing global qualities This is just something I encountered. Could be that some profiles got corrupted. In my case, I had a bug in Uranium that I fixed later. Contributes to issue CURA-6793. --- cura/Machines/MachineNode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 29968512ce..72652f2987 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -177,5 +177,7 @@ class MachineNode(ContainerNode): global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.quality_definition, global_quality = "True") # First try specific to this printer. if len(global_qualities) == 0: # This printer doesn't override the global qualities. global_qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter", global_quality = "True") # Otherwise pick the global global qualities. + if len(global_qualities) == 0: # There are no global qualities either?! Something went very wrong, but we'll not crash and properly fill the tree. + global_qualities = [cura.CuraApplication.CuraApplication.getInstance().empty_quality_container.getMetaData()] for global_quality in global_qualities: self.global_qualities[global_quality["quality_type"]] = QualityNode(global_quality["id"], parent = self) From 9b836d95d9db1c2a08ed43a53af2487c140294ed Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 13:00:38 +0200 Subject: [PATCH 670/994] Remove quality, variant and material manager We don't use them any more and they are deprecated. Removing them removes a lot of maintenance. Contributes to issue CURA-6801. --- cura/CuraApplication.py | 17 -- cura/Machines/MaterialManager.py | 349 ------------------------------- cura/Machines/QualityManager.py | 215 ------------------- cura/Machines/VariantManager.py | 98 --------- tests/TestMaterialManager.py | 187 ----------------- tests/TestQualityManager.py | 129 ------------ 6 files changed, 995 deletions(-) delete mode 100644 cura/Machines/MaterialManager.py delete mode 100644 cura/Machines/QualityManager.py delete mode 100644 cura/Machines/VariantManager.py delete mode 100644 tests/TestMaterialManager.py delete mode 100644 tests/TestQualityManager.py diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 579be0d953..8caccc786e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -73,9 +73,6 @@ from cura.Scene import ZOffsetDecorator from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MachineErrorChecker import MachineErrorChecker -import cura.Machines.MaterialManager #Imported like this to prevent circular imports. -import cura.Machines.QualityManager #Imported like this to prevent circular imports. -from cura.Machines.VariantManager import VariantManager from cura.Machines.Models.BuildPlateModel import BuildPlateModel from cura.Machines.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel @@ -924,20 +921,6 @@ class CuraApplication(QtApplication): self._extruder_manager = ExtruderManager() return self._extruder_manager - @deprecated("Use the ContainerTree structure instead.", since = "4.3") - def getVariantManager(self, *args) -> VariantManager: - return VariantManager.getInstance() - - # Can't deprecate this function since the deprecation marker collides with pyqtSlot! - @pyqtSlot(result = QObject) - def getMaterialManager(self, *args) -> cura.Machines.MaterialManager.MaterialManager: - return cura.Machines.MaterialManager.MaterialManager.getInstance() - - # Can't deprecate this function since the deprecation marker collides with pyqtSlot! - @pyqtSlot(result = QObject) - def getQualityManager(self, *args) -> cura.Machines.QualityManager.QualityManager: - return cura.Machines.QualityManager.QualityManager.getInstance() - def getIntentManager(self, *args) -> IntentManager: return IntentManager.getInstance() diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py deleted file mode 100644 index 83be6941ea..0000000000 --- a/cura/Machines/MaterialManager.py +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from collections import defaultdict -import copy -import uuid -from typing import Dict, Optional, TYPE_CHECKING, Any, List, cast - -from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot - -from UM.Decorators import deprecated -from UM.Logger import Logger -from UM.Settings.ContainerRegistry import ContainerRegistry -from UM.Util import parseBool -import cura.CuraApplication # Imported like this to prevent circular imports. -from cura.Machines.ContainerTree import ContainerTree -from cura.Settings.CuraContainerRegistry import CuraContainerRegistry - -from .MaterialNode import MaterialNode -from .MaterialGroup import MaterialGroup - -if TYPE_CHECKING: - from UM.Settings.DefinitionContainer import DefinitionContainer - from UM.Settings.InstanceContainer import InstanceContainer - from cura.Settings.GlobalStack import GlobalStack - from cura.Settings.ExtruderStack import ExtruderStack - - -# -# MaterialManager maintains a number of maps and trees for material lookup. -# The models GUI and QML use are now only dependent on the MaterialManager. That means as long as the data in -# MaterialManager gets updated correctly, the GUI models should be updated correctly too, and the same goes for GUI. -# -# For now, updating the lookup maps and trees here is very simple: we discard the old data completely and recreate them -# again. This means the update is exactly the same as initialization. There are performance concerns about this approach -# but so far the creation of the tables and maps is very fast and there is no noticeable slowness, we keep it like this -# because it's simple. -# -class MaterialManager(QObject): - __instance = None - - @classmethod - @deprecated("Use the ContainerTree structure instead.", since = "4.3") - def getInstance(cls) -> "MaterialManager": - if cls.__instance is None: - cls.__instance = MaterialManager() - return cls.__instance - - materialsUpdated = pyqtSignal() # Emitted whenever the material lookup tables are updated. - favoritesUpdated = pyqtSignal() # Emitted whenever the favorites are changed - - def __init__(self, parent = None): - super().__init__(parent) - # Material_type -> generic material metadata - self._fallback_materials_map = dict() # type: Dict[str, Dict[str, Any]] - - # Root_material_id -> MaterialGroup - self._material_group_map = dict() # type: Dict[str, MaterialGroup] - - # Material id including diameter (generic_pla_175) -> material root id (generic_pla) - self._diameter_material_map = dict() # type: Dict[str, str] - - # This is used in Legacy UM3 send material function and the material management page. - # GUID -> a list of material_groups - self._guid_material_groups_map = defaultdict(list) # type: Dict[str, List[MaterialGroup]] - - self._favorites = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) - self.materialsUpdated.emit() - - self._update_timer = QTimer(self) - self._update_timer.setInterval(300) - - self._update_timer.setSingleShot(True) - self._update_timer.timeout.connect(self.materialsUpdated) - - container_registry = ContainerRegistry.getInstance() - container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) - container_registry.containerAdded.connect(self._onContainerMetadataChanged) - container_registry.containerRemoved.connect(self._onContainerMetadataChanged) - - def _onContainerMetadataChanged(self, container): - self._onContainerChanged(container) - - def _onContainerChanged(self, container): - container_type = container.getMetaDataEntry("type") - if container_type != "material": - return - - # update the maps - - self._update_timer.start() - - def getMaterialGroup(self, root_material_id: str) -> Optional[MaterialGroup]: - return self._material_group_map.get(root_material_id) - - def getRootMaterialIDForDiameter(self, root_material_id: str, approximate_diameter: str) -> str: - original_material = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(id=root_material_id)[0] - if original_material["approximate_diameter"] == approximate_diameter: - return root_material_id - - matching_materials = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(type = "material", brand = original_material["brand"], definition = original_material["definition"], material = original_material["material"], color_name = original_material["color_name"]) - for material in matching_materials: - if material["approximate_diameter"] == approximate_diameter: - return material["id"] - return root_material_id - - def getRootMaterialIDWithoutDiameter(self, root_material_id: str) -> str: - return self._diameter_material_map.get(root_material_id, "") - - def getMaterialGroupListByGUID(self, guid: str) -> Optional[List[MaterialGroup]]: - return self._guid_material_groups_map.get(guid) - - # Returns a dict of all material groups organized by root_material_id. - def getAllMaterialGroups(self) -> Dict[str, "MaterialGroup"]: - return self._material_group_map - - ## Gives a dictionary of all root material IDs and their associated - # MaterialNodes from the ContainerTree that are available for the given - # printer and variant. - def getAvailableMaterials(self, definition_id: str, nozzle_name: Optional[str]) -> Dict[str, MaterialNode]: - return ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials - - # - # A convenience function to get available materials for the given machine with the extruder position. - # - def getAvailableMaterialsForMachineExtruder(self, machine: "GlobalStack", - extruder_stack: "ExtruderStack") -> Dict[str, MaterialNode]: - nozzle_name = None - if extruder_stack.variant.getId() != "empty_variant": - nozzle_name = extruder_stack.variant.getName() - - # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. - materials = self.getAvailableMaterials(machine.definition.getId(), nozzle_name) - compatible_material_diameter = extruder_stack.getApproximateMaterialDiameter() - result = {key: material for key, material in materials.items() if material.container and float(material.container.getMetaDataEntry("approximate_diameter")) == compatible_material_diameter} - return result - - # - # Gets MaterialNode for the given extruder and machine with the given material name. - # Returns None if: - # 1. the given machine doesn't have materials; - # 2. cannot find any material InstanceContainers with the given settings. - # - def getMaterialNode(self, machine_definition_id: str, nozzle_name: Optional[str], - buildplate_name: Optional[str], diameter: float, root_material_id: str) -> Optional["MaterialNode"]: - container_tree = ContainerTree.getInstance() - machine_node = container_tree.machines.get(machine_definition_id) - if machine_node is None: - Logger.log("w", "Could not find machine with definition %s in the container tree", machine_definition_id) - return None - - variant_node = machine_node.variants.get(nozzle_name) - if variant_node is None: - Logger.log("w", "Could not find variant %s for machine with definition %s in the container tree", nozzle_name, machine_definition_id ) - return None - - material_node = variant_node.materials.get(root_material_id) - - if material_node is None: - Logger.log("w", "Could not find material %s for machine with definition %s and variant %s in the container tree", root_material_id, machine_definition_id, nozzle_name) - return None - - return material_node - - # - # Gets MaterialNode for the given extruder and machine with the given material type. - # Returns None if: - # 1. the given machine doesn't have materials; - # 2. cannot find any material InstanceContainers with the given settings. - # - def getMaterialNodeByType(self, global_stack: "GlobalStack", position: str, nozzle_name: str, - buildplate_name: Optional[str], material_guid: str) -> Optional["MaterialNode"]: - machine_definition = global_stack.definition - extruder = global_stack.extruderList[int(position)] - variant_name = extruder.variant.getName() - approximate_diameter = extruder.getApproximateMaterialDiameter() - - return self.getMaterialNode(machine_definition.getId(), variant_name, buildplate_name, approximate_diameter, material_guid) - - # There are 2 ways to get fallback materials; - # - A fallback by type (@sa getFallbackMaterialIdByMaterialType), which adds the generic version of this material - # - A fallback by GUID; If a material has been duplicated, it should also check if the original materials do have - # a GUID. This should only be done if the material itself does not have a quality just yet. - def getFallBackMaterialIdsByMaterial(self, material: "InstanceContainer") -> List[str]: - results = [] # type: List[str] - - material_groups = self.getMaterialGroupListByGUID(material.getMetaDataEntry("GUID")) - for material_group in material_groups: # type: ignore - if material_group.name != material.getId(): - # If the material in the group is read only, put it at the front of the list (since that is the most - # likely one to get a result) - if material_group.is_read_only: - results.insert(0, material_group.name) - else: - results.append(material_group.name) - - fallback = self.getFallbackMaterialIdByMaterialType(material.getMetaDataEntry("material")) - if fallback is not None: - results.append(fallback) - return results - - # - # Built-in quality profiles may be based on generic material IDs such as "generic_pla". - # For materials such as ultimaker_pla_orange, no quality profiles may be found, so we should fall back to use - # the generic material IDs to search for qualities. - # - # An example would be, suppose we have machine with preferred material set to "filo3d_pla" (1.75mm), but its - # extruders only use 2.85mm materials, then we won't be able to find the preferred material for this machine. - # A fallback would be to fetch a generic material of the same type "PLA" as "filo3d_pla", and in this case it will - # be "generic_pla". This function is intended to get a generic fallback material for the given material type. - # - # This function returns the generic root material ID for the given material type, where material types are "PLA", - # "ABS", etc. - # - def getFallbackMaterialIdByMaterialType(self, material_type: str) -> Optional[str]: - # For safety - if material_type not in self._fallback_materials_map: - Logger.log("w", "The material type [%s] does not have a fallback material" % material_type) - return None - fallback_material = self._fallback_materials_map[material_type] - if fallback_material: - return self.getRootMaterialIDWithoutDiameter(fallback_material["id"]) - else: - return None - - ## Get default material for given global stack, extruder position and extruder nozzle name - # you can provide the extruder_definition and then the position is ignored (useful when building up global stack in CuraStackBuilder) - def getDefaultMaterial(self, global_stack: "GlobalStack", position: str, nozzle_name: Optional[str], - extruder_definition: Optional["DefinitionContainer"] = None) -> "MaterialNode": - definition_id = global_stack.definition.getId() - machine_node = ContainerTree.getInstance().machines[definition_id] - if nozzle_name in machine_node.variants: - nozzle_node = machine_node.variants[nozzle_name] - else: - Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id)) - nozzle_node = next(iter(machine_node.variants)) - - if not parseBool(global_stack.getMetaDataEntry("has_materials", False)): - return next(iter(nozzle_node.materials)) - - if extruder_definition is not None: - material_diameter = extruder_definition.getProperty("material_diameter", "value") - else: - material_diameter = global_stack.extruders[position].getCompatibleMaterialDiameter() - approximate_material_diameter = round(material_diameter) - - return nozzle_node.preferredMaterial(approximate_material_diameter) - - def removeMaterialByRootId(self, root_material_id: str): - container_registry = CuraContainerRegistry.getInstance() - results = container_registry.findContainers(id = root_material_id) - if not results: - container_registry.addWrongContainerId(root_material_id) - - for result in results: - container_registry.removeContainer(result.getMetaDataEntry("id", "")) - - @pyqtSlot("QVariant", result = bool) - def canMaterialBeRemoved(self, material_node: "MaterialNode"): - # Check if the material is active in any extruder train. In that case, the material shouldn't be removed! - # In the future we might enable this again, but right now, it's causing a ton of issues if we do (since it - # corrupts the configuration) - root_material_id = material_node.base_file - ids_to_remove = {metadata.get("id", "") for metadata in CuraContainerRegistry.getInstance().findInstanceContainersMetadata(base_file = root_material_id)} - - for extruder_stack in CuraContainerRegistry.getInstance().findContainerStacks(type = "extruder_train"): - if extruder_stack.material.getId() in ids_to_remove: - return False - return True - - ## Change the user-visible name of a material. - # \param material_node The ContainerTree node of the material to rename. - # \param name The new name for the material. - @pyqtSlot("QVariant", str) - def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: - return cura.CuraApplication.CuraApplication.getMaterialManagementModel().setMaterialName(material_node, name) - - ## Deletes a material from Cura. - # - # This function does not do any safety checking any more. Please call this - # function only if: - # - The material is not read-only. - # - The material is not used in any stacks. - # If the material was not lazy-loaded yet, this will fully load the - # container. When removing this material node, all other materials with - # the same base fill will also be removed. - # \param material_node The material to remove. - @pyqtSlot("QVariant") - def removeMaterial(self, material_node: "MaterialNode") -> None: - return cura.CuraApplication.CuraApplication.getMaterialManagementModel().setMaterialName(material_node) - - def duplicateMaterialByRootId(self, root_material_id: str, new_base_id: Optional[str] = None, new_metadata: Optional[Dict[str, Any]] = None) -> Optional[str]: - result = cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().duplicateMaterialByBaseFile(root_material_id, new_base_id, new_metadata) - if result is None: - return "ERROR" - return result - - ## Creates a duplicate of a material with the same GUID and base_file - # metadata. - # \param material_node The node representing the material to duplicate. - # \param new_base_id A new material ID for the base material. The IDs of - # the submaterials will be based off this one. If not provided, a material - # ID will be generated automatically. - # \param new_metadata Metadata for the new material. If not provided, this - # will be duplicated from the original material. - # \return The root material ID of the duplicate material. - @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Optional[Dict[str, Any]] = None) -> str: - result = cura.CuraApplication.CuraApplication.getInstance().getMaterialManagementModel().duplicateMaterial(material_node, new_base_id, new_metadata) - if result is None: - return "ERROR" - return result - - ## Create a new material by cloning the preferred material for the current - # material diameter and generate a new GUID. - # - # The material type is explicitly left to be the one from the preferred - # material, since this allows the user to still have SOME profiles to work - # with. - # \return The ID of the newly created material. - @pyqtSlot(result = str) - def createMaterial(self) -> str: - return cura.CuraApplication.CuraApplication.getMaterialManagementModel().createMaterial() - - @pyqtSlot(str) - def addFavorite(self, root_material_id: str) -> None: - self._favorites.add(root_material_id) - self.materialsUpdated.emit() - - # Ensure all settings are saved. - cura.CuraApplication.CuraApplication.getInstance().getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) - cura.CuraApplication.CuraApplication.getInstance().saveSettings() - - @pyqtSlot(str) - def removeFavorite(self, root_material_id: str) -> None: - try: - self._favorites.remove(root_material_id) - except KeyError: - Logger.log("w", "Could not delete material %s from favorites as it was already deleted", root_material_id) - return - self.materialsUpdated.emit() - - # Ensure all settings are saved. - cura.CuraApplication.CuraApplication.getInstance().getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) - cura.CuraApplication.CuraApplication.getInstance().saveSettings() - - @pyqtSlot() - def getFavorites(self): - return self._favorites diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py deleted file mode 100644 index 4aa88d6775..0000000000 --- a/cura/Machines/QualityManager.py +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from typing import Any, Dict, List, Optional, TYPE_CHECKING - -from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot - -from UM.Util import parseBool -from UM.Settings.InstanceContainer import InstanceContainer -from UM.Decorators import deprecated - -import cura.CuraApplication -from cura.Settings.ExtruderStack import ExtruderStack - -from cura.Machines.ContainerTree import ContainerTree # The implementation that replaces this manager, to keep the deprecated interface working. -from .QualityChangesGroup import QualityChangesGroup -from .QualityGroup import QualityGroup -from .QualityNode import QualityNode - -if TYPE_CHECKING: - from UM.Settings.Interfaces import DefinitionContainerInterface - from cura.Settings.GlobalStack import GlobalStack - from .QualityChangesGroup import QualityChangesGroup - - -# -# Similar to MaterialManager, QualityManager maintains a number of maps and trees for quality profile lookup. -# The models GUI and QML use are now only dependent on the QualityManager. That means as long as the data in -# QualityManager gets updated correctly, the GUI models should be updated correctly too, and the same goes for GUI. -# -# For now, updating the lookup maps and trees here is very simple: we discard the old data completely and recreate them -# again. This means the update is exactly the same as initialization. There are performance concerns about this approach -# but so far the creation of the tables and maps is very fast and there is no noticeable slowness, we keep it like this -# because it's simple. -# -class QualityManager(QObject): - __instance = None - - @classmethod - @deprecated("Use the ContainerTree structure instead.", since = "4.3") - def getInstance(cls) -> "QualityManager": - if cls.__instance is None: - cls.__instance = QualityManager() - return cls.__instance - - qualitiesUpdated = pyqtSignal() - - def __init__(self, parent = None) -> None: - super().__init__(parent) - application = cura.CuraApplication.CuraApplication.getInstance() - self._container_registry = application.getContainerRegistry() - - self._empty_quality_container = application.empty_quality_container - self._empty_quality_changes_container = application.empty_quality_changes_container - - # For quality lookup - self._machine_nozzle_buildplate_material_quality_type_to_quality_dict = {} # type: Dict[str, QualityNode] - - # For quality_changes lookup - self._machine_quality_type_to_quality_changes_dict = {} # type: Dict[str, QualityNode] - - self._default_machine_definition_id = "fdmprinter" - - self._container_registry.containerMetaDataChanged.connect(self._onContainerMetadataChanged) - self._container_registry.containerAdded.connect(self._onContainerMetadataChanged) - self._container_registry.containerRemoved.connect(self._onContainerMetadataChanged) - - def _onContainerMetadataChanged(self, container: InstanceContainer) -> None: - self._onContainerChanged(container) - - def _onContainerChanged(self, container: InstanceContainer) -> None: - container_type = container.getMetaDataEntry("type") - if container_type not in ("quality", "quality_changes"): - return - - # Returns a dict of "custom profile name" -> QualityChangesGroup - def getQualityChangesGroups(self, machine: "GlobalStack") -> List[QualityChangesGroup]: - variant_names = [extruder.variant.getName() for extruder in machine.extruderList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in machine.extruderList] - extruder_enabled = [extruder.isEnabled for extruder in machine.extruderList] - machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] - return machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled) - - ## Gets the quality groups for the current printer. - # - # Both available and unavailable quality groups will be included. Whether - # a quality group is available can be known via the field - # ``QualityGroup.is_available``. For more details, see QualityGroup. - # \return A dictionary with quality types as keys and the quality groups - # for those types as values. - def getQualityGroups(self, global_stack: "GlobalStack") -> Dict[str, QualityGroup]: - # Gather up the variant names and material base files for each extruder. - variant_names = [extruder.variant.getName() for extruder in global_stack.extruderList] - material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in global_stack.extruderList] - extruder_enabled = [extruder.isEnabled for extruder in global_stack.extruderList] - definition_id = global_stack.definition.getId() - return ContainerTree.getInstance().machines[definition_id].getQualityGroups(variant_names, material_bases, extruder_enabled) - - def getQualityGroupsForMachineDefinition(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: - machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) - - # To find the quality container for the GlobalStack, check in the following fall-back manner: - # (1) the machine-specific node - # (2) the generic node - machine_node = self._machine_nozzle_buildplate_material_quality_type_to_quality_dict.get(machine_definition_id) - default_machine_node = self._machine_nozzle_buildplate_material_quality_type_to_quality_dict.get( - self._default_machine_definition_id) - nodes_to_check = [machine_node, default_machine_node] - - # Iterate over all quality_types in the machine node - quality_group_dict = dict() - for node in nodes_to_check: - if node and node.quality_type: - quality_group = QualityGroup(node.getMetaDataEntry("name", ""), node.quality_type) - quality_group.setGlobalNode(node) - quality_group_dict[node.quality_type] = quality_group - - return quality_group_dict - - ## Get the quality group for the preferred quality type for a certain - # global stack. - # - # If the preferred quality type is not available, ``None`` will be - # returned. - # \param machine The global stack of the machine to get the preferred - # quality group for. - # \return The preferred quality group, or ``None`` if that is not - # available. - def getDefaultQualityType(self, machine: "GlobalStack") -> Optional[QualityGroup]: - machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] - quality_groups = self.getQualityGroups(machine) - result = quality_groups.get(machine_node.preferred_quality_type) - if result is not None and result.is_available: - return result - return None # If preferred quality type is not available, leave it up for the caller. - - - # - # Methods for GUI - # - - ## Deletes a custom profile. It will be gone forever. - # \param quality_changes_group The quality changes group representing the - # profile to delete. - @pyqtSlot(QObject) - def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().removeQualityChangesGroup(quality_changes_group) - - ## Rename a custom profile. - # - # Because the names must be unique, the new name may not actually become - # the name that was given. The actual name is returned by this function. - # \param quality_changes_group The custom profile that must be renamed. - # \param new_name The desired name for the profile. - # \return The actual new name of the profile, after making the name - # unique. - @pyqtSlot(QObject, str, result = str) - def renameQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", new_name: str) -> str: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().renameQualityChangesGroup(quality_changes_group, new_name) - - ## Duplicates a given quality profile OR quality changes profile. - # \param new_name The desired name of the new profile. This will be made - # unique, so it might end up with a different name. - # \param quality_model_item The item of this model to duplicate, as - # dictionary. See the descriptions of the roles of this list model. - @pyqtSlot(str, "QVariantMap") - def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item: Dict[str, Any]) -> None: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().duplicateQualityChanges(quality_changes_name, quality_model_item) - - ## Create quality changes containers from the user containers in the active - # stacks. - # - # This will go through the global and extruder stacks and create - # quality_changes containers from the user containers in each stack. These - # then replace the quality_changes containers in the stack and clear the - # user settings. - # \param base_name The new name for the quality changes profile. The final - # name of the profile might be different from this, because it needs to be - # made unique. - @pyqtSlot(str) - def createQualityChanges(self, base_name: str) -> None: - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel().createQualityChanges(base_name) - - ## Create a quality changes container with the given set-up. - # \param quality_type The quality type of the new container. - # \param new_name The name of the container. This name must be unique. - # \param machine The global stack to create the profile for. - # \param extruder_stack The extruder stack to create the profile for. If - # not provided, only a global container will be created. - def _createQualityChanges(self, quality_type: str, new_name: str, machine: "GlobalStack", extruder_stack: Optional["ExtruderStack"]) -> "InstanceContainer": - return cura.CuraApplication.CuraApplication.getInstance().getQualityManagementModel()._createQualityChanges(quality_type, new_name, machine, extruder_stack) - -# -# Gets the machine definition ID that can be used to search for Quality containers that are suitable for the given -# machine. The rule is as follows: -# 1. By default, the machine definition ID for quality container search will be "fdmprinter", which is the generic -# machine. -# 2. If a machine has its own machine quality (with "has_machine_quality = True"), we should use the given machine's -# own machine definition ID for quality search. -# Example: for an Ultimaker 3, the definition ID should be "ultimaker3". -# 3. When condition (2) is met, AND the machine has "quality_definition" defined in its definition file, then the -# definition ID specified in "quality_definition" should be used. -# Example: for an Ultimaker 3 Extended, it has "quality_definition = ultimaker3". This means Ultimaker 3 Extended -# shares the same set of qualities profiles as Ultimaker 3. -# -def getMachineDefinitionIDForQualitySearch(machine_definition: "DefinitionContainerInterface", - default_definition_id: str = "fdmprinter") -> str: - machine_definition_id = default_definition_id - if parseBool(machine_definition.getMetaDataEntry("has_machine_quality", False)): - # Only use the machine's own quality definition ID if this machine has machine quality. - machine_definition_id = machine_definition.getMetaDataEntry("quality_definition") - if machine_definition_id is None: - machine_definition_id = machine_definition.getId() - - return machine_definition_id diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py deleted file mode 100644 index 617f85b8ca..0000000000 --- a/cura/Machines/VariantManager.py +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from collections import OrderedDict -from typing import Optional, TYPE_CHECKING, Dict - -from UM.ConfigurationErrorMessage import ConfigurationErrorMessage -from UM.Decorators import deprecated -from UM.Logger import Logger -from UM.Util import parseBool - -from cura.Machines.ContainerNode import ContainerNode -from cura.Machines.VariantType import VariantType, ALL_VARIANT_TYPES -from cura.Settings.CuraContainerRegistry import CuraContainerRegistry -from cura.Settings.GlobalStack import GlobalStack - -if TYPE_CHECKING: - from UM.Settings.DefinitionContainer import DefinitionContainer - - -# -# VariantManager is THE place to look for a specific variant. It maintains two variant lookup tables with the following -# structure: -# -# [machine_definition_id] -> [variant_type] -> [variant_name] -> ContainerNode(metadata / container) -# Example: "ultimaker3" -> "buildplate" -> "Glass" (if present) -> ContainerNode -# -> ... -# -> "nozzle" -> "AA 0.4" -# -> "BB 0.8" -# -> ... -# -# [machine_definition_id] -> [machine_buildplate_type] -> ContainerNode(metadata / container) -# Example: "ultimaker3" -> "glass" (this is different from the variant name) -> ContainerNode -# -# Note that the "container" field is not loaded in the beginning because it would defeat the purpose of lazy-loading. -# A container is loaded when getVariant() is called to load a variant InstanceContainer. -# -class VariantManager: - __instance = None - - @classmethod - @deprecated("Use the ContainerTree structure instead.", since = "4.3") - def getInstance(cls) -> "VariantManager": - if cls.__instance is None: - cls.__instance = VariantManager() - return cls.__instance - - def __init__(self) -> None: - self._machine_to_variant_dict_map = dict() # type: Dict[str, Dict["VariantType", Dict[str, ContainerNode]]] - - self._exclude_variant_id_list = ["empty_variant"] - - # - # Gets the variant InstanceContainer with the given information. - # Almost the same as getVariantMetadata() except that this returns an InstanceContainer if present. - # - def getVariantNode(self, machine_definition_id: str, variant_name: str, - variant_type: Optional["VariantType"] = None) -> Optional["ContainerNode"]: - if variant_type is None: - variant_node = None - variant_type_dict = self._machine_to_variant_dict_map.get("machine_definition_id", {}) - for variant_dict in variant_type_dict.values(): - if variant_name in variant_dict: - variant_node = variant_dict[variant_name] - break - return variant_node - - return self._machine_to_variant_dict_map.get(machine_definition_id, {}).get(variant_type, {}).get(variant_name) - - def getVariantNodes(self, machine: "GlobalStack", variant_type: "VariantType") -> Dict[str, ContainerNode]: - machine_definition_id = machine.definition.getId() - return self._machine_to_variant_dict_map.get(machine_definition_id, {}).get(variant_type, {}) - - # - # Gets the default variant for the given machine definition. - # If the optional GlobalStack is given, the metadata information will be fetched from the GlobalStack instead of - # the DefinitionContainer. Because for machines such as UM2, you can enable Olsson Block, which will set - # "has_variants" to True in the GlobalStack. In those cases, we need to fetch metadata from the GlobalStack or - # it may not be correct. - # - def getDefaultVariantNode(self, machine_definition: "DefinitionContainer", - variant_type: "VariantType", - global_stack: Optional["GlobalStack"] = None) -> Optional["ContainerNode"]: - machine_definition_id = machine_definition.getId() - container_for_metadata_fetching = global_stack if global_stack is not None else machine_definition - - preferred_variant_name = None - if variant_type == VariantType.BUILD_PLATE: - if parseBool(container_for_metadata_fetching.getMetaDataEntry("has_variant_buildplates", False)): - preferred_variant_name = container_for_metadata_fetching.getMetaDataEntry("preferred_variant_buildplate_name") - else: - if parseBool(container_for_metadata_fetching.getMetaDataEntry("has_variants", False)): - preferred_variant_name = container_for_metadata_fetching.getMetaDataEntry("preferred_variant_name") - - node = None - if preferred_variant_name: - node = self.getVariantNode(machine_definition_id, preferred_variant_name, variant_type) - return node diff --git a/tests/TestMaterialManager.py b/tests/TestMaterialManager.py deleted file mode 100644 index d87ab3a63e..0000000000 --- a/tests/TestMaterialManager.py +++ /dev/null @@ -1,187 +0,0 @@ -from unittest.mock import MagicMock, patch -import pytest -from cura.Machines.MaterialManager import MaterialManager - - -mocked_registry = MagicMock() -material_1 = {"id": "test", "GUID":"TEST!", "base_file": "base_material", "definition": "fdmmachine", "approximate_diameter": "3", "brand": "generic", "material": "pla"} -material_2 = {"id": "base_material", "GUID": "TEST2!", "base_file": "test", "definition": "fdmmachine", "approximate_diameter": "3", "material": "pla"} -mocked_registry.findContainersMetadata = MagicMock(return_value = [material_1, material_2]) - - -mocked_definition = MagicMock() -mocked_definition.getId = MagicMock(return_value = "fdmmachine") -mocked_definition.getMetaDataEntry = MagicMock(return_value = []) - -# These tests are outdated -pytestmark = pytest.mark.skip - -def test_initialize(application): - # Just test if the simple loading works - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - # Double check that we actually got some material nodes - assert manager.getMaterialGroup("base_material").name == "base_material" - assert manager.getMaterialGroup("test").name == "test" - - -def test_getMaterialGroupListByGUID(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - assert manager.getMaterialGroupListByGUID("TEST!")[0].name == "test" - assert manager.getMaterialGroupListByGUID("TEST2!")[0].name == "base_material" - - -def test_getRootMaterialIDforDiameter(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - assert manager.getRootMaterialIDForDiameter("base_material", "3") == "base_material" - - -def test_getMaterialNodeByTypeMachineHasNoMaterials(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - mocked_stack = MagicMock() - assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "") is None - - -def test_getMaterialNodeByTypeMachineHasMaterialsButNoMaterialFound(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - mocked_stack = MagicMock() - mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = True) # For the "has_materials" metadata - - assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "") is None - - -def test_getMaterialNodeByTypeMachineHasMaterialsAndMaterialExists(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - mocked_result = MagicMock() - manager.getMaterialNode = MagicMock(return_value = mocked_result) - mocked_stack = MagicMock() - mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = True) # For the "has_materials" metadata - - assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "TEST!") is mocked_result - - -def test_getAllMaterialGroups(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - material_groups = manager.getAllMaterialGroups() - - assert "base_material" in material_groups - assert "test" in material_groups - assert material_groups["base_material"].name == "base_material" - assert material_groups["test"].name == "test" - - -class TestAvailableMaterials: - def test_happy(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 3) - - assert "base_material" in available_materials - assert "test" in available_materials - - def test_wrongDiameter(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 200) - assert available_materials == {} # Nothing found. - - def test_excludedMaterials(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - with patch.object(mocked_definition, "getMetaDataEntry", MagicMock(return_value = ["test"])): - available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 3) - assert "base_material" in available_materials - assert "test" not in available_materials - - -class Test_getFallbackMaterialIdByMaterialType: - def test_happyFlow(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - assert manager.getFallbackMaterialIdByMaterialType("pla") == "test" - - def test_unknownMaterial(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - assert manager.getFallbackMaterialIdByMaterialType("OMGZOMG") is None - - -def test_getMaterialNode(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager._updateMaps() - - assert manager.getMaterialNode("fdmmachine", None, None, 3, "base_material").container_id == "test" - - -def test_getAvailableMaterialsForMachineExtruder(application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.initialize() - - mocked_machine = MagicMock() - mocked_machine.getBuildplateName = MagicMock(return_value = "build_plate") - mocked_machine.definition = mocked_definition - mocked_extruder_stack = MagicMock() - mocked_extruder_stack.variant.getId = MagicMock(return_value = "test") - mocked_extruder_stack.getApproximateMaterialDiameter = MagicMock(return_value = 2.85) - - available_materials = manager.getAvailableMaterialsForMachineExtruder(mocked_machine, mocked_extruder_stack) - assert "base_material" in available_materials - assert "test" in available_materials - - -class TestFavorites: - def test_addFavorite(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.materialsUpdated = MagicMock() - manager.addFavorite("blarg") - assert manager.getFavorites() == {"blarg"} - - application.getPreferences().setValue.assert_called_once_with("cura/favorite_materials", "blarg") - manager.materialsUpdated.emit.assert_called_once_with() - - def test_removeNotExistingFavorite(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.materialsUpdated = MagicMock() - manager.removeFavorite("blarg") - manager.materialsUpdated.emit.assert_not_called() - - def test_removeExistingFavorite(self, application): - with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): - manager = MaterialManager(mocked_registry) - manager.materialsUpdated = MagicMock() - manager.addFavorite("blarg") - - manager.removeFavorite("blarg") - assert manager.materialsUpdated.emit.call_count == 2 - application.getPreferences().setValue.assert_called_with("cura/favorite_materials", "") - assert manager.getFavorites() == set() \ No newline at end of file diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py deleted file mode 100644 index fb96f4476b..0000000000 --- a/tests/TestQualityManager.py +++ /dev/null @@ -1,129 +0,0 @@ -from unittest.mock import MagicMock, patch - -import pytest - -from cura.Machines.QualityChangesGroup import QualityChangesGroup -from cura.Machines.QualityManager import QualityManager - -mocked_stack = MagicMock() -mocked_extruder = MagicMock() - -mocked_material = MagicMock() -mocked_material.getMetaDataEntry = MagicMock(return_value = "base_material") - -mocked_extruder.material = mocked_material -mocked_stack.extruders = {"0": mocked_extruder} - -# These tests are outdated -pytestmark = pytest.mark.skip - -@pytest.fixture() -def material_manager(): - result = MagicMock() - result.getRootMaterialIDWithoutDiameter = MagicMock(return_value = "base_material") - return result - -@pytest.fixture() -def container_registry(): - result = MagicMock() - mocked_metadata = [{"id": "test", "definition": "fdmprinter", "quality_type": "normal", "name": "test_name", "global_quality": True, "type": "quality"}, - {"id": "test_material", "definition": "fdmprinter", "quality_type": "normal", "name": "test_name_material", "material": "base_material", "type": "quality"}, - {"id": "quality_changes_id", "definition": "fdmprinter", "type": "quality_changes", "quality_type": "amazing!", "name": "herp"}] - result.findContainersMetadata = MagicMock(return_value = mocked_metadata) - - result.uniqueName = MagicMock(return_value = "uniqueName") - return result - - -@pytest.fixture() -def quality_mocked_application(material_manager, container_registry): - result = MagicMock() - result.getMaterialManager = MagicMock(return_value=material_manager) - result.getContainerRegistry = MagicMock(return_value=container_registry) - return result - - -def test_getQualityGroups(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - - assert "normal" in manager.getQualityGroups(mocked_stack) - - -def test_getQualityChangesGroup(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - - assert "herp" in [qcg.name for qcg in manager.getQualityChangesGroups(mocked_stack)] - - -@pytest.mark.skip("Doesn't work on remote") -def test_getDefaultQualityType(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - mocked_stack = MagicMock() - mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = "normal") - assert manager.getDefaultQualityType(mocked_stack).quality_type == "normal" - - -def test_createQualityChanges(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - mocked_quality_changes = MagicMock() - manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes) - manager.initialize() - container_manager = MagicMock() - - manager._container_registry.addContainer = MagicMock() # Side effect we want to check. - with patch("cura.Settings.ContainerManager.ContainerManager.getInstance", container_manager): - manager.createQualityChanges("derp") - assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) - - -def test_renameQualityChangesGroup(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - - mocked_container = MagicMock() - - quality_changes_group = QualityChangesGroup("zomg", "beep") - quality_changes_group.getAllNodes = MagicMock(return_value = [mocked_container]) - - # We need to check for "uniqueName" instead of "NEWRANDOMNAMEYAY" because the mocked registry always returns - # "uniqueName" when attempting to generate an unique name. - assert manager.renameQualityChangesGroup(quality_changes_group, "NEWRANDOMNAMEYAY") == "uniqueName" - assert mocked_container.setName.called_once_with("uniqueName") - - -def test_duplicateQualityChangesQualityOnly(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - mocked_quality = MagicMock() - quality_group = MagicMock() - quality_group.getAllNodes = MagicMock(return_value = mocked_quality) - mocked_quality_changes = MagicMock() - - # Isolate what we want to test (in this case, we're not interested if createQualityChanges does it's job!) - manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes) - manager._container_registry.addContainer = MagicMock() # Side effect we want to check. - - manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": None}) - assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) - - -def test_duplicateQualityChanges(quality_mocked_application): - manager = QualityManager(quality_mocked_application) - manager.initialize() - mocked_quality = MagicMock() - quality_group = MagicMock() - quality_group.getAllNodes = MagicMock(return_value = mocked_quality) - quality_changes_group = MagicMock() - mocked_quality_changes = MagicMock() - quality_changes_group.getAllNodes = MagicMock(return_value = [mocked_quality_changes]) - mocked_quality_changes.duplicate = MagicMock(return_value = mocked_quality_changes) - - manager._container_registry.addContainer = MagicMock() # Side effect we want to check. - - manager.duplicateQualityChanges("zomg", {"intent_category": "default", - "quality_group": quality_group, - "quality_changes_group": quality_changes_group}) - assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) From 7348c70af6e7453b7a2f69bbccde65e47d7370c5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 13:56:23 +0200 Subject: [PATCH 671/994] Don't get whole container to just get metadata A performance improvement, especially in the material models. Contributes to issue CURA-6793. --- cura/Machines/MaterialManager.py | 2 +- cura/Machines/Models/BaseMaterialsModel.py | 6 +++--- cura/Machines/Models/FavoriteMaterialsModel.py | 2 +- cura/Machines/Models/GenericMaterialsModel.py | 4 ++-- cura/Machines/Models/MaterialBrandsModel.py | 6 +++--- cura/Machines/QualityGroup.py | 4 ++-- cura/Settings/ContainerManager.py | 5 ++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 83be6941ea..549d7bf747 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -132,7 +132,7 @@ class MaterialManager(QObject): # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. materials = self.getAvailableMaterials(machine.definition.getId(), nozzle_name) compatible_material_diameter = extruder_stack.getApproximateMaterialDiameter() - result = {key: material for key, material in materials.items() if material.container and float(material.container.getMetaDataEntry("approximate_diameter")) == compatible_material_diameter} + result = {key: material for key, material in materials.items() if material.container and float(material.getMetaDataEntry("approximate_diameter")) == compatible_material_diameter} return result # diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index edcdacb8a1..368d30ae25 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -126,8 +126,8 @@ class BaseMaterialsModel(ListModel): if material_base_file in self._available_materials: self._update() - ## This is an abstract method that needs to be implemented by the specific - # models themselves. + ## This is an abstract method that needs to be implemented by the specific + # models themselves. def _update(self): self._favorite_ids = set(cura.CuraApplication.CuraApplication.getInstance().getPreferences().getValue("cura/favorite_materials").split(";")) @@ -141,7 +141,7 @@ class BaseMaterialsModel(ListModel): nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials approximate_material_diameter = extruder_stack.getApproximateMaterialDiameter() - self._available_materials = {key: material for key, material in materials.items() if float(material.container.getMetaDataEntry("approximate_diameter", -1)) == approximate_material_diameter} + self._available_materials = {key: material for key, material in materials.items() if float(material.getMetaDataEntry("approximate_diameter", -1)) == approximate_material_diameter} ## This method is used by all material models in the beginning of the # _update() method in order to prevent errors. It's the same in all models diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index 255ef1dc0a..77ae4da115 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -27,7 +27,7 @@ class FavoriteMaterialsModel(BaseMaterialsModel): for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.container.getMetaDataEntry("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Only add results for favorite materials diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index 2542a6412a..42aff40d0d 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -18,11 +18,11 @@ class GenericMaterialsModel(BaseMaterialsModel): for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.container.getMetaDataEntry("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Only add results for generic materials - if container_node.container.getMetaDataEntry("brand", "unknown").lower() != "generic": + if container_node.getMetaDataEntry("brand", "unknown").lower() != "generic": continue item = self._createMaterialItem(root_material_id, container_node) diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index dea6982f03..184d27f390 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -37,18 +37,18 @@ class MaterialBrandsModel(BaseMaterialsModel): # Part 1: Generate the entire tree of brands -> material types -> spcific materials for root_material_id, container_node in self._available_materials.items(): # Do not include the materials from a to-be-removed package - if bool(container_node.container.getMetaDataEntry("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Add brands we haven't seen yet to the dict, skipping generics - brand = container_node.container.getMetaDataEntry("brand", "") + brand = container_node.getMetaDataEntry("brand", "") if brand.lower() == "generic": continue if brand not in brand_group_dict: brand_group_dict[brand] = {} # Add material types we haven't seen yet to the dict - material_type = container_node.container.getMetaDataEntry("material", "") + material_type = container_node.getMetaDataEntry("material", "") if material_type not in brand_group_dict[brand]: brand_group_dict[brand][material_type] = [] diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 48047974a9..58ba3acc63 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -68,7 +68,7 @@ class QualityGroup: if not node.container: Logger.log("w", "Node {0} doesn't have a container.".format(node.container_id)) return - is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) + is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental def setExtruderNode(self, position: int, node: "ContainerNode") -> None: @@ -78,5 +78,5 @@ class QualityGroup: if not node.container: Logger.log("w", "Node {0} doesn't have a container.".format(node.container_id)) return - is_experimental = parseBool(node.container.getMetaDataEntry("is_experimental", False)) + is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False)) self.is_experimental |= is_experimental diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index af360ec235..4a4a7b64dd 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -85,7 +85,7 @@ class ContainerManager(QObject): if container_node.container is None: Logger.log("w", "Container node {0} doesn't have a container.".format(container_node.container_id)) return False - root_material_id = container_node.container.getMetaDataEntry("base_file", "") + root_material_id = container_node.getMetaDataEntry("base_file", "") container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry() if container_registry.isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) @@ -350,8 +350,7 @@ class ContainerManager(QObject): @pyqtSlot("QVariant") def unlinkMaterial(self, material_node: "MaterialNode") -> None: # Get the material group - if material_node.container is None: - Logger.log("w", "Material node {0} doesn't have a container.".format(material_node.container_id)) + if material_node.container is None: # Failed to lazy-load this container. return root_material_query = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry().findInstanceContainers(id = material_node.getMetaDataEntry("base_file", "")) if not root_material_query: From 5624f0a8aeb398f3bc8ac9e3a68239e925fadcc4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 14:59:46 +0200 Subject: [PATCH 672/994] Fix tests with new lazy-loading technique The new lazy loading requests different functions from the registry so we need to mock that out. Also fix the manual insertion of things into the lazy-loaded mapping. Contributes to issue CURA-6793. --- tests/Machines/TestContainerTree.py | 39 ++++------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index 9a088cc80c..c07eff340b 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -29,6 +29,7 @@ def createMockedStack(definition_id: str): def container_registry(): result = MagicMock() result.findContainerStacks = MagicMock(return_value = [createMockedStack("machine_1"), createMockedStack("machine_2")]) + result.findContainersMetadata = lambda id: [{"id": id}] if id in {"machine_1", "machine_2"} else [] return result @pytest.fixture @@ -40,38 +41,8 @@ def test_containerTreeInit(container_registry): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() - assert "machine_1" in container_tree.machines - assert "machine_2" in container_tree.machines - - -def test_newMachineAdded(container_registry): - mocked_definition_container = MagicMock(spec = DefinitionContainer) - mocked_definition_container.getId = MagicMock(return_value = "machine_3") - - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - container_tree = ContainerTree() - # machine_3 shouldn't be there, as on init it wasn't in the registry - assert "machine_3" not in container_tree.machines - - # It should only react when a globalStack is added. - container_tree._machineAdded(mocked_definition_container) - assert "machine_3" not in container_tree.machines - - container_tree._machineAdded(createMockedStack("machine_3")) - assert "machine_3" in container_tree.machines - - -def test_alreadyKnownMachineAdded(container_registry): - mocked_definition_container = MagicMock(spec = DefinitionContainer) - mocked_definition_container.getId = MagicMock(return_value = "machine_2") - - with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): - container_tree = ContainerTree() - assert len(container_tree.machines) == 2 - - # The ID is already there, so no machine should be added. - container_tree._machineAdded(mocked_definition_container) - assert len(container_tree.machines) == 2 + assert "machine_1" in container_tree.machines + assert "machine_2" in container_tree.machines def test_getCurrentQualityGroupsNoGlobalStack(container_registry): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): @@ -84,7 +55,7 @@ def test_getCurrentQualityGroupsNoGlobalStack(container_registry): def test_getCurrentQualityGroups(container_registry, application): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() - container_tree.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + container_tree.machines.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): result = container_tree.getCurrentQualityGroups() @@ -108,7 +79,7 @@ def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry): def test_getCurrentQualityChangesGroups(container_registry, application): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() - container_tree.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + container_tree.machines.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): result = container_tree.getCurrentQualityChangesGroups() From 8179dfc4125f51cc1897cc10d64963b3316ebcb5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 15:04:07 +0200 Subject: [PATCH 673/994] Make cache of machines a protected field We don't want to use it outside of the mapping. This mapping should be transparent. We are still using it from our tests though but that's fine. Tests are allowed to touch private fields. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 12 ++++++------ tests/Machines/TestContainerTree.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 788f30e9e1..bfede3d977 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -84,7 +84,7 @@ class ContainerTree: # This handles the lazy loading of MachineNodes. class MachineNodeMap: def __init__(self): - self.machines = {} + self._machines = {} ## Returns whether a printer with a certain definition ID exists. This # is regardless of whether or not the printer is loaded yet. @@ -99,12 +99,12 @@ class ContainerTree: # \param definition_id The definition to look for. # \return A machine node for that definition. def __getitem__(self, definition_id: str) -> MachineNode: - if definition_id not in self.machines: + if definition_id not in self._machines: start_time = time.time() - self.machines[definition_id] = MachineNode(definition_id) - self.machines[definition_id].materialsChanged.connect(ContainerTree.getInstance().materialsChanged) + self._machines[definition_id] = MachineNode(definition_id) + self._machines[definition_id].materialsChanged.connect(ContainerTree.getInstance().materialsChanged) Logger.log("d", "Adding container tree for {definition_id} took {duration} seconds.".format(definition_id = definition_id, duration = time.time() - start_time)) - return self.machines[definition_id] + return self._machines[definition_id] ## Gets a machine node for the specified definition ID, with default. # @@ -125,7 +125,7 @@ class ContainerTree: # \param definition_id The definition that we may have cached. # \return ``True`` if it's cached. def is_loaded(self, definition_id: str) -> bool: - return definition_id in self.machines + return definition_id in self._machines ## Pre-loads all currently added printers as a background task so that # switching printers in the interface is faster. diff --git a/tests/Machines/TestContainerTree.py b/tests/Machines/TestContainerTree.py index c07eff340b..ef11d9acc0 100644 --- a/tests/Machines/TestContainerTree.py +++ b/tests/Machines/TestContainerTree.py @@ -55,7 +55,7 @@ def test_getCurrentQualityGroupsNoGlobalStack(container_registry): def test_getCurrentQualityGroups(container_registry, application): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() - container_tree.machines.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): result = container_tree.getCurrentQualityGroups() @@ -79,7 +79,7 @@ def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry): def test_getCurrentQualityChangesGroups(container_registry, application): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)): container_tree = ContainerTree() - container_tree.machines.machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. + container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters. with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): result = container_tree.getCurrentQualityChangesGroups() From 87f9c6d7ccfa6d8e7daaff2d9b610a02e384c842 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Oct 2019 14:11:29 +0000 Subject: [PATCH 674/994] Add typing for MachineNodeMap's constructor Contributes to issue CURA-6793. Co-Authored-By: Jaime van Kessel --- cura/Machines/ContainerTree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index bfede3d977..699c621fbe 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -83,7 +83,7 @@ class ContainerTree: # # This handles the lazy loading of MachineNodes. class MachineNodeMap: - def __init__(self): + def __init__(self) -> None: self._machines = {} ## Returns whether a printer with a certain definition ID exists. This @@ -152,4 +152,4 @@ class ContainerTree: continue definition_id = stack.definition.getId() if not self.tree_root.machines.is_loaded(definition_id): - _ = self.tree_root.machines[definition_id] \ No newline at end of file + _ = self.tree_root.machines[definition_id] From 8322a36548c52308db86efc4a2a44b78b8e63272 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2019 16:59:52 +0200 Subject: [PATCH 675/994] Fix some QML warnings in the MaterialsPage --- .../Materials/MaterialsBrandSection.qml | 13 ++++------ .../Preferences/Materials/MaterialsSlot.qml | 2 ++ .../Materials/MaterialsTypeSection.qml | 24 +++++++------------ 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 487c87f07c..5dd68c426f 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -10,6 +10,8 @@ import QtQuick.Dialogs 1.2 import UM 1.2 as UM import Cura 1.0 as Cura +// An expandable list of materials. Includes both the header (this file) and the items (brandMaterialList) + Item { id: brand_section @@ -50,9 +52,8 @@ Item verticalAlignment: Text.AlignVCenter leftPadding: (UM.Theme.getSize("default_margin").width / 2) | 0 } - Button + Item { - text: "" implicitWidth: UM.Theme.getSize("favorites_button").width implicitHeight: UM.Theme.getSize("favorites_button").height UM.RecolorImage @@ -67,10 +68,6 @@ Item color: "black" source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") } - style: ButtonStyle - { - background: Item { } - } } } MouseArea @@ -99,7 +96,7 @@ Item id: brandMaterialList anchors.top: brand_header.bottom width: parent.width - anchors.left: parent.left + anchors.left: parent ? parent.left : undefined height: brand_section.expanded ? childrenRect.height : 0 visible: brand_section.expanded @@ -109,7 +106,7 @@ Item delegate: Loader { id: loader - width: parent.width + width: parent ? parent.width : 0 property var element: model sourceComponent: hasMaterialTypes ? materialsTypeSection : materialSlot } diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index c6691460cf..81bb8759ff 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -10,6 +10,8 @@ import QtQuick.Dialogs 1.2 import UM 1.2 as UM import Cura 1.0 as Cura +// A single material row, typically used in a MaterialsBrandSection + Rectangle { id: materialSlot diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 3c36e12651..07630a83b4 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -20,8 +20,8 @@ Item property var expanded: materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1 property var colorsModel: materialType != null ? materialType.colors: null height: childrenRect.height - width: parent.width - anchors.left: parent.left + width: parent ? parent.width :undefined + anchors.left: parent ? parent.left : undefined Rectangle { id: material_type_header_background @@ -55,7 +55,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width anchors { - left: parent.left + left: parent ? parent.left : undefined } Label { @@ -65,33 +65,25 @@ Item id: material_type_name verticalAlignment: Text.AlignVCenter } - Button + Item // this one causes lots of warnings { - text: "" implicitWidth: UM.Theme.getSize("favorites_button").width implicitHeight: UM.Theme.getSize("favorites_button").height UM.RecolorImage { anchors { - verticalCenter: parent.verticalCenter - horizontalCenter: parent.horizontalCenter + verticalCenter: parent ? parent.verticalCenter : undefined + horizontalCenter: parent ? parent.horizontalCenter : undefined } width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") } - style: ButtonStyle - { - background: Rectangle - { - anchors.fill: parent - color: "transparent" - } - } + } } - MouseArea + MouseArea // causes lots of warnings { anchors.fill: material_type_header onPressed: From ad5fae5b6675af9093a1fe286d2a63a6eb68c3a9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 17 Oct 2019 01:29:24 +0200 Subject: [PATCH 676/994] Only allow optimising infill travels when combing is enabled That's the only time when it will have any effect, since the only thing this does is to calculate the distance to the next infill line better if the nozzle has to make a detour due to combing. --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 55061d793d..a1df3aed66 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6217,6 +6217,7 @@ "label": "Infill Travel Optimization", "description": "When enabled, the order in which the infill lines are printed is optimized to reduce the distance travelled. The reduction in travel time achieved very much depends on the model being sliced, infill pattern, density, etc. Note that, for some models that have many small areas of infill, the time to slice the model may be greatly increased.", "type": "bool", + "enabled": "resolveOrValue('retraction_combing') != 'off'", "default_value": false, "settable_per_mesh": true }, From f3f9a2393f26ec02d0d25aa64d37c8706bd20eb0 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 16 Oct 2019 20:24:50 +0100 Subject: [PATCH 677/994] Return early from _checkStackForErrors() if top container is empty. --- plugins/CuraEngineBackend/StartSliceJob.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index b973a0775a..06ef2d97b1 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -106,6 +106,10 @@ class StartSliceJob(Job): if stack is None: return False + # if there are no per-object settings we don't need to check the other settings here + if stack.getTop() == None or len(stack.getTop().getAllKeys()) == 0: + return False + for key in stack.getAllKeys(): validation_state = stack.getProperty(key, "validationState") if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid): From 664ed4a6a67fce8a86fb0f1d049931a1d0193b56 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 17 Oct 2019 12:52:30 +0200 Subject: [PATCH 678/994] Take a more generic approach to safe areas for the SimulationView Re-implements layer slider positioning CURA-6853 --- plugins/PreviewStage/PreviewMain.qml | 16 +++++++++++++--- .../SimulationViewMainComponent.qml | 12 ++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index a065a751ac..1b8387644d 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -11,6 +11,17 @@ import Cura 1.0 as Cura Item { + + // Subtract the actionPanel from the safe area. This way the view won't draw interface elements under/over it + Item { + id: safeArea + visible: false + anchors.left: parent.left + anchors.right: actionPanelWidget.left + anchors.top: parent.top + anchors.bottom: actionPanelWidget.top + } + Loader { id: previewMain @@ -18,12 +29,11 @@ Item source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : "" - // Indicate that the layer slider should stay above the action panel Binding { target: previewMain.item - property: "layerSliderSafeYMax" - value: actionPanelWidget.y + property: "safeArea" + value:safeArea } } diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index ddbb5b6224..65621605df 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -11,11 +11,14 @@ import Cura 1.0 as Cura Item { + // An Item whose bounds are guaranteed to be safe for overlays to be placed. + // Defaults to parent, ie. the entire available area + // eg. the layer slider will not be placed in this area. + property var safeArea: parent + + property bool isSimulationPlaying: false - // By default, the layer slider can extend to the entire height of the parent - // A parent may bind this property to indicate the bottom of a safe area - // for the Layer slider - property var layerSliderSafeYMax: parent.height + readonly property var layerSliderSafeYMax: safeArea.y + safeArea.height visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity @@ -221,6 +224,7 @@ Item // Make sure the slider handlers show the correct value after switching views Component.onCompleted: { + print("safeArea: " + safeArea, "layerSliderSafeYMax", layerSliderSafeYMax) layerSlider.setLowerValue(UM.SimulationView.minimumLayer) layerSlider.setUpperValue(UM.SimulationView.currentLayer) } From 3709cfa4edcd038fe36f3ad58c05f5072727d840 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 17 Oct 2019 15:54:03 +0200 Subject: [PATCH 679/994] Add tooltips for intent profiles to the Recommended Quality panel. The description is optional. Tooltip will not show if no description is set CURA-6853 --- cura/Machines/Models/IntentCategoryModel.py | 39 ++++++++++++++----- cura/Settings/MachineManager.py | 5 ++- .../RecommendedQualityProfileSelector.qml | 19 +++++++++ 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index d7d1ee2710..0268d067a9 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -3,7 +3,7 @@ from PyQt5.QtCore import Qt import collections -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Optional from cura.Machines.Models.IntentModel import IntentModel from cura.Settings.IntentManager import IntentManager @@ -25,16 +25,26 @@ class IntentCategoryModel(ListModel): IntentCategoryRole = Qt.UserRole + 2 WeightRole = Qt.UserRole + 3 QualitiesRole = Qt.UserRole + 4 - - #Translations to user-visible string. Ordered by weight. - #TODO: Create a solution for this name and weight to be used dynamically. - name_translation = collections.OrderedDict() #type: "collections.OrderedDict[str,str]" - name_translation["default"] = catalog.i18nc("@label", "Default") - name_translation["engineering"] = catalog.i18nc("@label", "Engineering") - name_translation["smooth"] = catalog.i18nc("@label", "Smooth") + DescriptionRole = Qt.UserRole + 5 modelUpdated = pyqtSignal() + # Translations to user-visible string. Ordered by weight. + # TODO: Create a solution for this name and weight to be used dynamically. + _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]" + _translations["default"] = { + "name": catalog.i18nc("@label", "Default") + } + _translations["engineering"] = { + "name": catalog.i18nc("@label", "Engineering"), + "description": catalog.i18nc("@text", "An profile which is suitable for engineering work") + + } + _translations["smooth"] = { + "name": catalog.i18nc("@label", "Smooth"), + "description": catalog.i18nc("@text", "Ohhh yeah. So tender. So smooth. So Perfect.") + } + ## Creates a new model for a certain intent category. # \param The category to list the intent profiles for. def __init__(self, intent_category: str) -> None: @@ -45,6 +55,7 @@ class IntentCategoryModel(ListModel): self.addRoleName(self.IntentCategoryRole, "intent_category") self.addRoleName(self.WeightRole, "weight") self.addRoleName(self.QualitiesRole, "qualities") + self.addRoleName(self.DescriptionRole, "description") application = cura.CuraApplication.CuraApplication.getInstance() @@ -75,10 +86,18 @@ class IntentCategoryModel(ListModel): qualities = IntentModel() qualities.setIntentCategory(category) result.append({ - "name": self.name_translation.get(category, catalog.i18nc("@label", "Unknown")), + "name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")), + "description": IntentCategoryModel.translation(category, "description", None), "intent_category": category, - "weight": list(self.name_translation.keys()).index(category), + "weight": list(self._translations.keys()).index(category), "qualities": qualities }) result.sort(key = lambda k: k["weight"]) self.setItems(result) + + ## Get a display value for a category. See IntenCategoryModel._translations + ## for categories and keys + @staticmethod + def translation(category: str, key: str, default: Optional[str] = None): + display_strings = IntentCategoryModel._translations.get(category, {}) + return display_strings.get(key, default) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 35f3268cce..d1f8cad4b3 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1586,8 +1586,9 @@ class MachineManager(QObject): intent_category = self.activeIntentCategory if intent_category != "default": - intent_display_name = IntentCategoryModel.name_translation.get(intent_category, - catalog.i18nc("@label", "Unknown")) + intent_display_name = IntentCategoryModel.translation(intent_category, + "name", + catalog.i18nc("@label", "Unknown")) display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, the_rest = display_name) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index d1f7dd7de2..a75783d096 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -163,6 +163,25 @@ Item isCheckedFunction: checkedFunction } + + MouseArea // tooltip hover area + { + anchors.fill: parent + hoverEnabled: true + enabled: model.description !== undefined + acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks + + onEntered: + { + print(model.description) + base.showTooltip( + intentCategoryLabel, + Qt.point(-(intentCategoryLabel.x - qualityRow.x) - UM.Theme.getSize("thick_margin").width, 0), + model.description + ) + } + onExited: base.hideTooltip() + } } } From b182830c2157ba3b539c6d92d561e3f9a04ea428 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 17 Oct 2019 17:17:06 +0200 Subject: [PATCH 680/994] Add tooltips for intent profiles to the Custom Quality panel. The description is optional. Tooltip will not show if no description is set CURA-6853 --- cura/Machines/Models/IntentCategoryModel.py | 2 +- .../Custom/QualitiesWithIntentMenu.qml | 21 ++++++++++++++++++- .../RecommendedQualityProfileSelector.qml | 1 - 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 0268d067a9..de909df534 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -37,7 +37,7 @@ class IntentCategoryModel(ListModel): } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "An profile which is suitable for engineering work") + "description": catalog.i18nc("@text", "A profile which is suitable for engineering work") } _translations["smooth"] = { diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index c9686a1519..c5a725285c 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -70,12 +70,31 @@ Popup { id: headerLabel text: model.name + color: UM.Theme.getColor("text_inactive") renderType: Text.NativeRendering + width: parent.width height: visible ? contentHeight: 0 - enabled: false visible: qualitiesList.visibleChildren.length > 0 anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width + + MouseArea // tooltip hover area + { + anchors.fill: parent + hoverEnabled: true + enabled: model.description !== undefined + acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks + + onEntered: + { + base.showTooltip( + headerLabel, + Qt.point(- UM.Theme.getSize("default_margin").width, 0), + model.description + ) + } + onExited: base.hideTooltip() + } } Column diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index a75783d096..05e7202f6d 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -173,7 +173,6 @@ Item onEntered: { - print(model.description) base.showTooltip( intentCategoryLabel, Qt.point(-(intentCategoryLabel.x - qualityRow.x) - UM.Theme.getSize("thick_margin").width, 0), From 82bd89991e7ee6f15da5ec1baa0d22111796842a Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 17 Oct 2019 16:42:43 +0100 Subject: [PATCH 681/994] Improve code style. --- plugins/CuraEngineBackend/StartSliceJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 06ef2d97b1..94f6d3edfa 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -107,7 +107,7 @@ class StartSliceJob(Job): return False # if there are no per-object settings we don't need to check the other settings here - if stack.getTop() == None or len(stack.getTop().getAllKeys()) == 0: + if stack.getTop() is None or not stack.getTop().getAllKeys(): return False for key in stack.getAllKeys(): From 84c9b28bb26f401234e939bc2b873bf4e4358151 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 00:07:43 +0200 Subject: [PATCH 682/994] Move maximum resolution itself out of experimental as well This was forgotten accidentally, it seems. --- resources/definitions/fdmprinter.def.json | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a1df3aed66..65ecbc1c91 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5833,6 +5833,18 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "meshfix_maximum_resolution": + { + "label": "Maximum Resolution", + "description": "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway.", + "type": "float", + "unit": "mm", + "default_value": 0.5, + "minimum_value": "0.001", + "minimum_value_warning": "0.01", + "maximum_value_warning": "3", + "settable_per_mesh": true + }, "meshfix_maximum_travel_resolution": { "label": "Maximum Travel Resolution", @@ -6255,18 +6267,6 @@ "settable_per_mesh": true, "settable_per_extruder": false }, - "meshfix_maximum_resolution": - { - "label": "Maximum Resolution", - "description": "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway.", - "type": "float", - "unit": "mm", - "default_value": 0.5, - "minimum_value": "0.001", - "minimum_value_warning": "0.01", - "maximum_value_warning": "3", - "settable_per_mesh": true - }, "support_skip_some_zags": { "label": "Break Up Support In Chunks", From 915c8e560ca945e419af7bcd5e7a0b2908ffda8c Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 18 Oct 2019 09:04:00 +0200 Subject: [PATCH 683/994] Fix mypy warning --- cura/Machines/Models/IntentCategoryModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index de909df534..8e7cd0fb5f 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -3,7 +3,7 @@ from PyQt5.QtCore import Qt import collections -from typing import TYPE_CHECKING, Optional +from typing import TYPE_CHECKING, Optional, Dict from cura.Machines.Models.IntentModel import IntentModel from cura.Settings.IntentManager import IntentManager @@ -31,7 +31,7 @@ class IntentCategoryModel(ListModel): # Translations to user-visible string. Ordered by weight. # TODO: Create a solution for this name and weight to be used dynamically. - _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]" + _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]]" _translations["default"] = { "name": catalog.i18nc("@label", "Default") } From c7a6fa4a006eb8a56c48f9f2eeafddc6603c63c0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 18 Oct 2019 11:59:21 +0200 Subject: [PATCH 684/994] Remove fixed override of prime tower position Now it uses the calculated value from fdm_printer, which is way smarter about it --- resources/definitions/ultimaker_s5.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index dfa8da5397..7eb37d0614 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -70,8 +70,6 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "value": "345" }, - "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": From 15bdf0fa1c16ae3f45c97c7ef91fa3c97787e38d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 18 Oct 2019 14:00:16 +0200 Subject: [PATCH 685/994] Change the description of 'Initial Bottom Layers'. part of CURA-5918 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8f115c2ed2..5f43cb0bfd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1194,7 +1194,7 @@ "initial_bottom_layers": { "label": "Initial Bottom Layers", - "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", + "description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.", "minimum_value": "0", "minimum_value_warning": "2", "default_value": 6, From 25d76aee5ac19d36ce9485be019575b77dbe08ad Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 18 Oct 2019 14:46:44 +0200 Subject: [PATCH 686/994] Workaround: Make the type-checker understand what's going on. --- plugins/CuraEngineBackend/StartSliceJob.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 94f6d3edfa..29a6d8ff30 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -107,7 +107,8 @@ class StartSliceJob(Job): return False # if there are no per-object settings we don't need to check the other settings here - if stack.getTop() is None or not stack.getTop().getAllKeys(): + stack_top = stack.getTop() + if stack_top is None or not stack_top.getAllKeys(): return False for key in stack.getAllKeys(): From 9316df72b3745d9ce55a5e70f9cc1320c0689c36 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 16:45:15 +0200 Subject: [PATCH 687/994] Add test for overriding default_value while there is a value This should not be done anywhere since the default_value won't have any effect then. We disregard CuraEngine's command line method here but that's infeasible with those profiles anyway. Done during Turbo Testing & Tooling. --- tests/Settings/TestDefinitionContainer.py | 71 ++++++++++++++++++++--- 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 73d4e89d20..0941840a05 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -1,18 +1,17 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import json # To check files for unnecessarily overridden properties. +import os +import os.path import pytest #This module contains automated tests. +from typing import Any, Dict +import uuid import UM.Settings.ContainerRegistry #To create empty instance containers. import UM.Settings.ContainerStack #To set the container registry the container stacks use. from UM.Settings.DefinitionContainer import DefinitionContainer #To check against the class of DefinitionContainer. - - -import os -import os.path -import uuid - from UM.Resources import Resources Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources"))) @@ -51,4 +50,62 @@ def assertIsDefinitionValid(definition_container, path, file_name): assert metadata[0]["platform"] in all_meshes if "platform_texture" in metadata[0]: - assert metadata[0]["platform_texture"] in all_images \ No newline at end of file + assert metadata[0]["platform_texture"] in all_images + +## Tests whether setting values are not being hidden by parent containers. +# +# When a definition container defines a "default_value" but inherits from a +# definition that defines a "value", the "default_value" is ineffective. This +# test fails on those things. +@pytest.mark.parametrize("file_name", machine_filepaths) +def test_validateOverridingDefaultValue(file_name): + definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name) + with open(definition_path, encoding = "utf-8") as f: + doc = json.load(f) + + if "inherits" not in doc: + return # We only want to check for documents where the inheritance overrides the children. If there's no inheritance, this can't happen so it's fine. + if "overrides" not in doc: + return # No settings are being overridden. No need to check anything. + parent_settings = getInheritedSettings(doc["inherits"]) + for key, val in doc["overrides"].items(): + if "value" in parent_settings[key]: + assert "default_value" not in val, "Unnecessary default_value in {file_name}".format(file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective. + +def getInheritedSettings(definition_id: str) -> Dict[str, Any]: + definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", definition_id + ".def.json") + with open(definition_path, encoding = "utf-8") as f: + doc = json.load(f) + result = {} + + if "inherits" in doc: # Recursive inheritance. + result.update(getInheritedSettings(doc["inherits"])) + if "settings" in doc: + result.update(flattenSettings(doc["settings"])) + if "overrides" in doc: + result = merge_dicts(result, doc["overrides"]) + + return result + +def flattenSettings(settings) -> Dict[str, Any]: + result = {} + for entry, contents in settings.items(): + if "children" in contents: + result.update(flattenSettings(contents["children"])) + del contents["children"] + result[entry] = contents + return result + +def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, Any]: + result = {} + result.update(base) + for key, val in overrides.items(): + if key not in result: + result[key] = val + continue + + if hasattr(result[key], "__getitem__") and hasattr(val, "__getitem__"): # Duck typing of dicts. Also works with JSON documents for sure. + result[key] = merge_dicts(result[key], val) + else: + result[key] = val + return result \ No newline at end of file From 76b5f9d37b05cd3a86ac01864c53b9051ad3997c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 16:57:57 +0200 Subject: [PATCH 688/994] Fix testing if JSON elements are mappings Turns out that the JSON objects extend from dict, so this works. Also turns out that strings have a __getitem__. Who knew? Done during Turbo Testing & Tooling. --- tests/Settings/TestDefinitionContainer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 0941840a05..3a54fc1bed 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -104,7 +104,7 @@ def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, An result[key] = val continue - if hasattr(result[key], "__getitem__") and hasattr(val, "__getitem__"): # Duck typing of dicts. Also works with JSON documents for sure. + if isinstance(result[key], dict) and isinstance(val, dict): result[key] = merge_dicts(result[key], val) else: result[key] = val From 1d7ad38db2f08379a3a4ebc1393e7b36a54ba59d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 17:00:47 +0200 Subject: [PATCH 689/994] Also name which setting has the dysfunctional override So that it's easier to remove it. Done during Turbo Testing & Tooling. --- tests/Settings/TestDefinitionContainer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 3a54fc1bed..fea360f1d2 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -70,7 +70,7 @@ def test_validateOverridingDefaultValue(file_name): parent_settings = getInheritedSettings(doc["inherits"]) for key, val in doc["overrides"].items(): if "value" in parent_settings[key]: - assert "default_value" not in val, "Unnecessary default_value in {file_name}".format(file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective. + assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective. def getInheritedSettings(definition_id: str) -> Dict[str, Any]: definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", definition_id + ".def.json") From 15ea29924a856e4073c41c0665a3c4e6cc5ee092 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 17:02:40 +0200 Subject: [PATCH 690/994] Sort definition files before testing them When going through the list of tests for many printers to fix them, it's then easier to go through the failed list. They will appear in the same order as in my IDE. Just a bit of an ease of life thing without any real cost. Done during Turbo Testing & Tooling. --- tests/Settings/TestDefinitionContainer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index fea360f1d2..09efc3fcb8 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -16,7 +16,7 @@ from UM.Resources import Resources Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources"))) -machine_filepaths = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions")) +machine_filepaths = sorted(os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions"))) all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes")) all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images")) From 4a5673746c5e53bbc9cd4265f5c5a0dd3cf1c2c1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 18 Oct 2019 18:38:16 +0200 Subject: [PATCH 691/994] Remove unused default_value overrides These are overrides of default_value while there is a value defined. As such these overrides had no effect at all. Changing them to value can actually change the behaviour of the profile. That is not what the profile author has apparently tested with, so I'm not doing that. I'm just removing the unused data. In the future if we get new definitions the author gets notified of the error so that he may test more effectively. The legacy can't be fixed without re-testing, so I'm leaving that to the authors. Done during Turbo Testing & Tooling. I want to go home for the weekend now... --- resources/definitions/101Hero.def.json | 1 - resources/definitions/3dator.def.json | 7 -- .../definitions/Mark2_for_Ultimaker2.def.json | 12 ---- resources/definitions/abax_pri3.def.json | 24 ------- resources/definitions/abax_pri5.def.json | 24 ------- resources/definitions/abax_titan.def.json | 24 ------- resources/definitions/alfawise_u20.def.json | 21 ------ resources/definitions/alfawise_u30.def.json | 7 -- resources/definitions/bfb.def.json | 9 +-- resources/definitions/bq_hephestos.def.json | 24 ------- resources/definitions/bq_hephestos_2.def.json | 14 +--- .../definitions/bq_hephestos_xl.def.json | 24 ------- resources/definitions/bq_witbox.def.json | 24 ------- resources/definitions/bq_witbox_2.def.json | 36 ---------- .../builder_premium_large.def.json | 4 -- .../builder_premium_medium.def.json | 4 -- .../builder_premium_small.def.json | 4 -- .../cocoon_create_modelmaker.def.json | 18 ----- resources/definitions/creality_cr-x.def.json | 5 +- resources/definitions/creatable_d3.def.json | 6 +- resources/definitions/cubicon_common.def.json | 45 +------------ .../definitions/dagoma_discoeasy200.def.json | 3 - resources/definitions/dagoma_magis.def.json | 3 - resources/definitions/dagoma_neva.def.json | 3 - resources/definitions/delta_go.def.json | 4 -- resources/definitions/deltabot.def.json | 5 -- resources/definitions/deltacomb.def.json | 12 ++-- resources/definitions/easyarts_ares.def.json | 18 ----- resources/definitions/erzay3d.def.json | 40 ----------- resources/definitions/fabtotum.def.json | 4 +- resources/definitions/felixpro2dual.def.json | 2 - resources/definitions/felixtec4dual.def.json | 1 - resources/definitions/flsun_qq_s.def.json | 8 +-- resources/definitions/geeetech_a30.def.json | 11 +--- resources/definitions/gmax15plus.def.json | 5 +- .../definitions/gmax15plus_dual.def.json | 5 +- resources/definitions/helloBEEprusa.def.json | 13 ---- .../definitions/innovo_inventor.def.json | 26 -------- resources/definitions/jgaurora_a1.def.json | 21 ------ resources/definitions/jgaurora_a3s.def.json | 21 ------ resources/definitions/jgaurora_a5.def.json | 21 ------ .../jgaurora_jgmaker_magic.def.json | 21 ------ .../definitions/jgaurora_z_603s.def.json | 23 +------ resources/definitions/julia.def.json | 11 ---- resources/definitions/makeit_pro_l.def.json | 15 ----- resources/definitions/makeit_pro_m.def.json | 15 ----- resources/definitions/maker_starter.def.json | 66 ------------------- .../definitions/makerbotreplicator.def.json | 2 - resources/definitions/malyan_m200.def.json | 2 - .../mankati_fullscale_xt_plus.def.json | 10 +-- resources/definitions/ord.def.json | 3 - resources/definitions/printrbot_play.def.json | 1 - resources/definitions/prusa_i3_mk2.def.json | 3 - .../definitions/punchtec_connect_xl.def.json | 6 -- resources/definitions/rigid3d.def.json | 10 --- resources/definitions/rigid3d_3rdgen.def.json | 8 --- resources/definitions/rigid3d_hobby.def.json | 8 --- resources/definitions/rigid3d_mucit.def.json | 5 -- resources/definitions/rigid3d_zero.def.json | 10 --- resources/definitions/rigid3d_zero2.def.json | 10 +-- resources/definitions/rigidbot.def.json | 22 ------- resources/definitions/rigidbot_big.def.json | 22 ------- resources/definitions/robo_3d_r1.def.json | 12 ---- .../definitions/seemecnc_artemis.def.json | 4 +- resources/definitions/seemecnc_v32.def.json | 4 +- resources/definitions/strateo3d.def.json | 2 +- ...tur3d_discov3ry1_complete_um2plus.def.json | 3 - resources/definitions/tam.def.json | 1 - resources/definitions/tizyx_evy.def.json | 5 -- .../definitions/ubuild-3d_mr_bot_280.def.json | 3 - resources/definitions/ultimaker2.def.json | 3 - .../definitions/ultimaker2_plus.def.json | 3 - resources/definitions/vertex_k8400.def.json | 6 -- .../definitions/vertex_k8400_dual.def.json | 6 -- .../definitions/vertex_nano_k8600.def.json | 6 -- resources/definitions/wanhao_d9.def.json | 2 - resources/definitions/zone3d_printer.def.json | 2 - 77 files changed, 24 insertions(+), 874 deletions(-) diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index a77ea5ed97..d356d15da9 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -34,7 +34,6 @@ }, "speed_print": { "default_value": 14 }, "speed_travel": { "value": "speed_print" }, - "speed_infill": { "default_value": 14 }, "speed_wall": { "value": "speed_print * 0.7" }, "speed_topbottom": { "value": "speed_print * 0.7" }, "speed_layer_0": { "value": "speed_print * 0.7" }, diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index 901ea87510..ac37523379 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -17,15 +17,10 @@ "overrides": { "machine_name": { "default_value": "3Dator" }, - "speed_travel": { "default_value": 120 }, "prime_tower_size": { "default_value": 8.660254037844387 }, "infill_sparse_density": { "default_value": 20 }, - "speed_wall_x": { "default_value": 45 }, - "speed_wall_0": { "default_value": 40 }, - "speed_topbottom": { "default_value": 35 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 50 }, - "speed_infill": { "default_value": 60 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_height": { "default_value": 260 }, @@ -33,8 +28,6 @@ "machine_depth": { "default_value": 170 }, "machine_width": { "default_value": 180 }, "retraction_speed": {"default_value":100}, - "cool_fan_speed_min": {"default_value": 20}, - "cool_fan_speed_max": {"default_value": 70}, "adhesion_type": { "default_value": "none" }, "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index b02dc78adf..1aca2a3844 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -79,9 +79,6 @@ "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "speed_layer_0": { - "default_value": 20 - }, "speed_support": { "value": "speed_wall_0" }, @@ -107,22 +104,18 @@ "default_value": 25 }, "switch_extruder_retraction_amount": { - "default_value": 0, "value": "retraction_amount", "enabled": false }, "switch_extruder_retraction_speeds": { - "default_value": 25, "value": "retraction_speed", "enabled": false }, "switch_extruder_retraction_speed": { - "default_value": 25, "value": "retraction_retract_speed", "enabled": false }, "switch_extruder_prime_speed": { - "default_value": 25, "value": "retraction_prime_speed", "enabled": false }, @@ -142,11 +135,9 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode" : { - "default_value": "", "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" }, "machine_end_gcode" : { - "default_value": "", "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" }, "machine_extruder_count": { @@ -158,12 +149,10 @@ }, "acceleration_print": { - "default_value": 2000, "value": "2000" }, "acceleration_travel": { - "default_value": 3000, "value": "acceleration_print if magic_spiralize else 3000" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, @@ -183,7 +172,6 @@ }, "jerk_travel": { - "default_value": 20, "value": "jerk_print if magic_spiralize else 20" }, "jerk_layer_0": { "value": "jerk_topbottom" }, diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 1ab48b865a..529636be90 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -49,33 +49,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 200 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 70 - }, - "speed_wall": { - "default_value": 25 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, - "speed_layer_0": { - "default_value": 30 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index 46229ce756..9e4e7e3b20 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -49,33 +49,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 200 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 70 - }, - "speed_wall": { - "default_value": 25 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, - "speed_layer_0": { - "default_value": 30 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 9f67117d6c..98643df22b 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -49,33 +49,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 200 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 70 - }, - "speed_wall": { - "default_value": 25 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, - "speed_layer_0": { - "default_value": 30 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/alfawise_u20.def.json b/resources/definitions/alfawise_u20.def.json index 748bf8797a..4da42fdb1d 100644 --- a/resources/definitions/alfawise_u20.def.json +++ b/resources/definitions/alfawise_u20.def.json @@ -47,12 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 210 - }, - "material_bed_temperature": { - "default_value": 50 - }, "layer_height_0": { "default_value": 0.2 }, @@ -62,21 +56,6 @@ "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json index 44caf61d1a..e05536f66c 100644 --- a/resources/definitions/alfawise_u30.def.json +++ b/resources/definitions/alfawise_u30.def.json @@ -22,16 +22,9 @@ "default_value": "; -- END GCODE --\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;turn the fan off; -- end of END GCODE --" }, "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { "default_value": 210 }, - "material_bed_temperature": { "default_value": 50 }, "layer_height_0": { "default_value": 0.2 }, "wall_thickness": { "default_value": 1.2 }, "speed_print": { "default_value": 40 }, - "speed_infill": { "default_value": 50 }, - "speed_wall": { "default_value": 35 }, - "speed_topbottom": { "default_value": 35 }, - "speed_travel": { "default_value": 120 }, - "speed_layer_0": { "default_value": 20 }, "support_enable": { "default_value": true }, "retraction_enable": { "default_value": true }, "retraction_amount": { "default_value": 5 }, diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index d1dfa9ef1b..e88c8c792b 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -15,26 +15,19 @@ }, "overrides": { - "speed_topbottom": { "default_value": 40 }, "speed_print": { "default_value": 40 }, "machine_extruder_count": { "default_value": 1 }, "prime_tower_size": { "default_value": 7.745966692414834 }, "machine_name": { "default_value": "BFB_Test" }, "machine_heated_bed": { "default_value": false }, - "speed_layer_0": { "default_value": 25 }, "machine_width": { "default_value": 275 }, "machine_gcode_flavor": { "default_value": "BFB" }, "machine_depth": { "default_value": 265 }, - "speed_infill": { "default_value": 30 }, "machine_center_is_zero": { "default_value": true }, "machine_height": { "default_value": 240 }, "layer_height": { "default_value": 0.25 }, - "material_print_temperature": { "default_value": 200 }, "retraction_amount": { "default_value": 0.05 }, - "speed_wall_0": { "default_value": 25 }, - "speed_travel": { "default_value": 50 }, "infill_sparse_density": { "default_value": 10 }, - "layer_height_0": { "default_value": 0.5 }, - "speed_wall_x": { "default_value": 20 } + "layer_height_0": { "default_value": 0.5 } } } diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index be024cd6fa..d9e84dae87 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -54,33 +54,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 220 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index 90a86433fb..5c122eb9a4 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -24,26 +24,14 @@ "machine_height": { "default_value": 220 }, "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": false }, - "material_print_temperature": { "default_value": 210 }, - "material_bed_temperature": { "default_value": 0 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "wall_line_count": { "default_value": 3 }, "wall_thickness": { "default_value": 1.2 }, "top_bottom_thickness": { "default_value": 1.2 }, "infill_sparse_density": { "default_value": 20 }, - "infill_overlap": { "default_value": 15 }, "speed_print": { "default_value": 60 }, - "speed_travel": { "default_value": 160 }, - "speed_layer_0": { "default_value": 30 }, - "speed_wall_x": { "default_value": 35 }, - "speed_wall_0": { "default_value": 30 }, - "speed_infill": { "default_value": 80 }, - "speed_topbottom": { "default_value": 35 }, - "skirt_brim_speed": { "default_value": 35 }, "skirt_line_count": { "default_value": 4 }, "skirt_brim_minimal_length": { "default_value": 30 }, - "skirt_gap": { "default_value": 6 }, - "cool_fan_full_at_height": { "default_value": 0.4 } + "skirt_gap": { "default_value": 6 } } } diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json index a8d63cbb41..16d0953bf1 100644 --- a/resources/definitions/bq_hephestos_xl.def.json +++ b/resources/definitions/bq_hephestos_xl.def.json @@ -53,33 +53,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 220 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index b96da6179c..fce2af9f97 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -54,33 +54,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, - "material_print_temperature": { - "default_value": 220 - }, - "material_bed_temperature": { - "default_value": 0 - }, "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index 7412647852..d1114aafd6 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -41,21 +41,12 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "material_print_temperature": { - "default_value": 210 - }, - "material_bed_temperature": { - "default_value": 0 - }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "wall_line_count": { - "default_value": 3 - }, "wall_thickness": { "default_value": 1.2 }, @@ -65,33 +56,9 @@ "infill_sparse_density": { "default_value": 20 }, - "infill_overlap": { - "default_value": 15 - }, "speed_print": { "default_value": 60 }, - "speed_travel": { - "default_value": 160 - }, - "speed_layer_0": { - "default_value": 30 - }, - "speed_wall_x": { - "default_value": 35 - }, - "speed_wall_0": { - "default_value": 30 - }, - "speed_infill": { - "default_value": 80 - }, - "speed_topbottom": { - "default_value": 35 - }, - "skirt_brim_speed": { - "default_value": 35 - }, "skirt_line_count": { "default_value": 4 }, @@ -101,9 +68,6 @@ "skirt_gap": { "default_value": 6 }, - "cool_fan_full_at_height": { - "default_value": 0.4 - }, "support_enable": { "default_value": false } diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index d100cd1ba9..e5411027e3 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -35,8 +35,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_speed": {"default_value": 15 }, - "switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_retraction_amount": {"value": 1 }, "speed_travel": { "value": "100" }, @@ -85,8 +83,6 @@ "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, - "retraction_retract_speed": { "default_value": 15 }, - "retraction_prime_speed": { "default_value": 15 }, "travel_retract_before_outer_wall": { "default_value": true }, "skin_overlap": { "value": "15" }, "adhesion_type": { "default_value": "skirt" }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 16aeeffdae..1817dfe7db 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -35,8 +35,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_speed": {"default_value": 15 }, - "switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_retraction_amount": {"value": 1 }, "speed_travel": { "value": "100" }, @@ -85,8 +83,6 @@ "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, - "retraction_retract_speed": { "default_value": 15 }, - "retraction_prime_speed": { "default_value": 15 }, "travel_retract_before_outer_wall": { "default_value": true }, "skin_overlap": { "value": "15" }, "adhesion_type": { "default_value": "skirt" }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 290e79660f..f126da7752 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -34,8 +34,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_speed": {"default_value": 15 }, - "switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_retraction_amount": {"value": 1 }, "speed_travel": { "value": "100" }, @@ -84,8 +82,6 @@ "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, - "retraction_retract_speed": { "default_value": 15 }, - "retraction_prime_speed": { "default_value": 15 }, "travel_retract_before_outer_wall": { "default_value": true }, "skin_overlap": { "value": "15" }, "adhesion_type": { "default_value": "skirt" }, diff --git a/resources/definitions/cocoon_create_modelmaker.def.json b/resources/definitions/cocoon_create_modelmaker.def.json index 83d1f41a99..b738dc64ff 100644 --- a/resources/definitions/cocoon_create_modelmaker.def.json +++ b/resources/definitions/cocoon_create_modelmaker.def.json @@ -47,9 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 220 - }, "layer_height": { "default_value": 0.10 }, @@ -65,21 +62,6 @@ "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 70 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/creality_cr-x.def.json b/resources/definitions/creality_cr-x.def.json index 0117c4fffe..15bea1edf1 100644 --- a/resources/definitions/creality_cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -32,7 +32,6 @@ "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "30" }, "speed_print": { "default_value": 60 }, - "speed_travel": { "default_value": 120 }, "machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 100 }, @@ -43,9 +42,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" }, "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" }, - "material_print_temperature": { "default_value": 200 }, "wall_thickness": { "default_value": 1 }, - "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { "default_value": 1 } + "top_bottom_thickness": { "default_value": 1 } } } diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 1491089e24..f621bcbe97 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -27,14 +27,12 @@ "machine_max_feedrate_z": { "default_value": 300 }, "gantry_height": {"value": "43"}, "layer_height": { "default_value": 0.1 }, - "relative_extrusion": { "default_value": false }, + "relative_extrusion": { "value": "False" }, "retraction_combing": { "default_value": "off" }, - "retraction_hop_enabled": { "default_value": true }, + "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_retract_speed": { "default_value": 100 }, "retraction_speed": { "default_value": 100 }, "retraction_amount": { "default_value": 4.5 }, - "retraction_prime_speed": { "default_value": 45 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM106 S255\nG28\nG92 E0\nG1 Z100 F5000\nM190 S50\nM109 S200\nG1 X-135\nG1 Z0.3\nG92 E-32\nG1 E0 F1000\nG1 E50 F200\nG1 F1000\nG1 X-125\nG92 E0" }, diff --git a/resources/definitions/cubicon_common.def.json b/resources/definitions/cubicon_common.def.json index ae085c7552..6b1e3d953e 100644 --- a/resources/definitions/cubicon_common.def.json +++ b/resources/definitions/cubicon_common.def.json @@ -23,77 +23,34 @@ "travel_compensate_overlapping_walls_enabled": { "default_value": false }, - "travel_compensate_overlapping_walls_0_enabled": { - "default_value": false - }, - "travel_compensate_overlapping_walls_x_enabled": { - "default_value": false - }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "infill_line_width": { - "default_value": 0.6 - }, "adhesion_type": { "default_value": "raft" }, - "roofing_pattern": { "default_value": "lines" }, "top_bottom_pattern": { "default_value": "lines" }, - "top_bottom_pattern_0": { - "default_value": "zigzag" - }, "fill_perimeter_gaps": { "default_value": "everywhere" }, - "infill_pattern": { - "default_value": "zigzag" - }, "infill_sparse_density": { "default_value": 20 }, - "infill_overlap": { - "default_value": 15 - }, "infill_before_walls": { "default_value": false }, - "infill_sparse_thickness": { "default_value": 0.2 }, "top_bottom_thickness": { "default_value": 1.0 }, - "top_thickness": { - "default_value": 1.0 - }, "bottom_thickness": { - "default_value": 0.6, "value": "top_bottom_thickness * 0.6" }, - "roofing_layer_count": { - "default_value": 1 - }, - "skin_preshrink": { "default_value": true }, "material_flow_layer_0": { "default_value": 100 }, - "top_skin_preshrink": { "default_value": 1.2 }, - "bottom_skin_preshrink": { "default_value": 1.2 }, "max_skin_angle_for_expansion": { "default_value": 90 }, - "min_skin_width_for_expansion": { "default_value": 2.7475 }, "skin_angles": { "default_value": "[135,45]" }, - "roofing_angles": { "default_value": "[135,45]" }, "coasting_volume": { "default_value": 0.032 }, "wall_thickness": { "default_value": 1.2 }, - "wall_line_count": { "default_value": 3 }, - "speed_wall_0": { "default_value": 25 }, - "skin_overlap": { "default_value": 5 }, "cool_min_layer_time_fan_speed_max": { "default_value": 15 }, "cool_min_layer_time": { "default_value": 15 }, - "support_roof_pattern": { "default_value": "zigzag" }, - "support_bottom_pattern": { "default_value": "zigzag" }, "support_interface_pattern": { "default_value": "zigzag" }, "support_pattern": { "default_value": "zigzag" }, - "retraction_amount": { "default_value": 1.5 }, - "top_layers": { - "default_value": 5 - }, - "bottom_layers": { - "default_value": 3 - } + "retraction_amount": { "default_value": 1.5 } } } \ No newline at end of file diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 17e285a422..30c0abdab2 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -52,9 +52,6 @@ "speed_print": { "default_value": 60 }, - "speed_travel": { - "default_value": 100 - }, "retraction_amount": { "default_value": 3.5 }, diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index 9d2f7170c6..dc5a0f86d2 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -55,9 +55,6 @@ "speed_print": { "default_value": 40 }, - "speed_travel": { - "default_value": 120 - }, "retraction_amount": { "default_value": 3.8 }, diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index ea6046b613..43a3e0c4f1 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -55,9 +55,6 @@ "speed_print": { "default_value": 40 }, - "speed_travel": { - "default_value": 120 - }, "retraction_amount": { "default_value": 3.8 }, diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index cd1fb180c2..04f0580898 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -16,12 +16,8 @@ "overrides": { "machine_name": { "default_value": "Delta Go" }, "default_material_print_temperature": { "default_value": 210 }, - "speed_travel": { "default_value": 150 }, "prime_tower_size": { "default_value": 8.66 }, "infill_sparse_density": { "default_value": 10 }, - "speed_wall_x": { "default_value": 30 }, - "speed_wall_0": { "default_value": 30 }, - "speed_topbottom": { "default_value": 20 }, "layer_height": { "default_value": 0.15 }, "speed_print": { "default_value": 30 }, "machine_heated_bed": { "default_value": false }, diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 613b61d32c..ad6a207bb2 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -15,15 +15,10 @@ }, "overrides": { - "speed_travel": { "default_value": 150 }, "prime_tower_size": { "default_value": 8.660254037844387 }, "infill_sparse_density": { "default_value": 10 }, - "speed_wall_x": { "default_value": 30 }, - "speed_wall_0": { "default_value": 30 }, - "speed_topbottom": { "default_value": 30 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 30 }, - "speed_infill": { "default_value": 30 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": true }, diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index c46beeec2d..ac2ea5abe1 100755 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -37,7 +37,7 @@ "retraction_amount" : { "default_value": 3.5 }, "retraction_speed" : { "default_value": 30 }, "retraction_combing" : { "default_value": "noskin" }, - "travel_avoid_distance": { "default_value": 1, "value": "1" }, + "travel_avoid_distance": { "value": "1" }, "speed_print" : { "default_value": 80 }, "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, @@ -45,7 +45,7 @@ "speed_wall_0": { "value": "30" }, "speed_wall_x": { "value": "speed_wall" }, "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, - "speed_travel": { "default_value": 150, "value": 150 }, + "speed_travel": { "value": 150 }, "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, "skirt_brim_speed": { "value": "speed_layer_0" }, "skirt_line_count": { "default_value": 3 }, @@ -57,10 +57,10 @@ "support_z_distance": { "value": "layer_height * 2" }, "support_bottom_distance": { "value": "layer_height" }, "support_use_towers" : { "default_value": false }, - "jerk_enabled": { "default_value": 1, "value": "1" }, - "jerk_infill" : { "default_value": 5, "value": "5" }, - "jerk_support" : { "default_value": 5, "value": "5" }, - "acceleration_enabled": { "default_value": 1, "value": "1" }, + "jerk_enabled": { "value": "True" }, + "jerk_infill" : { "value": "5" }, + "jerk_support" : { "value": "5" }, + "acceleration_enabled": { "value": "1" }, "acceleration_travel" : { "value": 5000 }, "machine_max_feedrate_z" : { "default_value": 300 } } diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 0e2742f484..18d73a3531 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -49,27 +49,9 @@ "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { - "default_value": 1 - }, "speed_print": { "default_value": 75 }, - "speed_infill": { - "default_value": 100 - }, - "speed_wall": { - "default_value": 25 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, - "speed_layer_0": { - "default_value": 30 - }, "support_enable": { "default_value": true } diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 0a6d676bea..875aea708e 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -56,57 +56,17 @@ "ironing_pattern": { "default_value": "concentric" }, "ironing_flow": { "default_value": 7.0 }, - "roofing_pattern": { "default_value": "concentric" }, "infill_sparse_density": { "default_value": 20 }, - "infill_line_distance": { "default_value": 4 }, "default_material_print_temperature": { "default_value": 220 }, - "material_print_temperature": { "default_value": 220 }, - "material_print_temperature_layer_0": { "default_value": 220 }, - "material_initial_print_temperature": { "default_value": 220 }, - "material_final_print_temperature": { "default_value": 220 }, "retraction_amount": { "default_value": 6.5 }, "speed_print": { "default_value": 40 }, - "speed_infill": { "default_value": 60 }, - "speed_wall": { "default_value": 20 }, - "speed_wall_0": { "default_value": 20 }, - "speed_wall_x": { "default_value": 40 }, - "speed_roofing": { "default_value": 20 }, - "speed_topbottom": { "default_value": 20 }, - "speed_support": { "default_value": 40 }, - "speed_support_infill": { "default_value": 40 }, - "speed_support_interface": { "default_value": 25 }, - "speed_support_roof": { "default_value": 25 }, - "speed_support_bottom": { "default_value": 25 }, - "speed_prime_tower": { "default_value": 40 }, - "speed_travel": { "default_value": 100 }, - "speed_layer_0": { "default_value": 20 }, - "speed_print_layer_0": { "default_value": 20 }, - "speed_travel_layer_0": { "default_value": 80 }, - "skirt_brim_speed": { "default_value": 20 }, "speed_equalize_flow_enabled": { "default_value": true }, "speed_equalize_flow_max": { "default_value": 100 }, "acceleration_print": { "default_value": 1000 }, - "acceleration_infill": { "default_value": 3000 }, - "acceleration_wall": { "default_value": 1000 }, - "acceleration_wall_0": { "default_value": 1000 }, - "acceleration_wall_x": { "default_value": 1000 }, - "acceleration_roofing": { "default_value": 1000 }, - "acceleration_topbottom": { "default_value": 1000 }, - "acceleration_support": { "default_value": 1000 }, - "acceleration_support_infill": { "default_value": 1000 }, - "acceleration_support_interface": { "default_value": 1000 }, - "acceleration_support_roof": { "default_value": 1000 }, - "acceleration_support_bottom": { "default_value": 1000 }, - "acceleration_prime_tower": { "default_value": 1000 }, - "acceleration_travel": { "default_value": 1500 }, - "acceleration_layer_0": { "default_value": 1000 }, - "acceleration_print_layer_0": { "default_value": 1000 }, - "acceleration_travel_layer_0": { "default_value": 1000 }, - "acceleration_skirt_brim": { "default_value": 1000 }, "jerk_print": { "default_value": 10 }, diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 959a5bdaec..355f6a1434 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -50,8 +50,8 @@ "retraction_hop_enabled": { "default_value": false }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "travel_avoid_distance": { "default_value": 1, "value": 1 }, - "speed_travel": { "default_value": 200, "value": 200 }, + "travel_avoid_distance": { "value": 1 }, + "speed_travel": { "value": 200 }, "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, "speed_wall": { "value": "speed_print" }, diff --git a/resources/definitions/felixpro2dual.def.json b/resources/definitions/felixpro2dual.def.json index 0c978cdb71..fdd8a1b694 100644 --- a/resources/definitions/felixpro2dual.def.json +++ b/resources/definitions/felixpro2dual.def.json @@ -24,7 +24,6 @@ "layer_height": { "default_value": 0.15 }, "layer_height_0": { "default_value": 0.2 }, - "speed_layer_0": { "default_value": 20}, "infill_sparse_density": { "default_value": 20 }, "wall_thickness": { "default_value": 1 }, @@ -53,7 +52,6 @@ "machine_center_is_zero": { "default_value": false }, "speed_print": { "default_value": 80 }, - "speed_travel": { "default_value": 200 }, "retraction_amount": { "default_value": 1 }, "retraction_speed": { "default_value": 50}, diff --git a/resources/definitions/felixtec4dual.def.json b/resources/definitions/felixtec4dual.def.json index ba5bcfa112..efc13c1759 100644 --- a/resources/definitions/felixtec4dual.def.json +++ b/resources/definitions/felixtec4dual.def.json @@ -39,7 +39,6 @@ "machine_center_is_zero": { "default_value": false }, "speed_print": { "default_value": 60 }, - "speed_travel": { "default_value": 200 }, "retraction_amount": { "default_value": 1 }, "retraction_speed": { "default_value": 50}, diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json index 5a739e9ae1..6b10a7f0cc 100644 --- a/resources/definitions/flsun_qq_s.def.json +++ b/resources/definitions/flsun_qq_s.def.json @@ -33,14 +33,8 @@ "z_seam_type": { "default_value": "back" }, - "top_thickness": { - "default_value": 5 - }, - "bottom_layers": { - "default_value": 4 - }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_nozzle_size": { "default_value": 0.4 diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index 3d8823f438..52b6ad8f7f 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -42,9 +42,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_bed_temperature": { - "default_value": 60 - }, "machine_nozzle_size": { "default_value": 0.4 }, @@ -60,12 +57,6 @@ "retraction_speed": { "default_value": 25 }, - "retraction_retract_speed": { - "default_value": 25 - }, - "retraction_prime_speed": { - "default_value": 25 - }, "adhesion_type": { "default_value": "skirt" }, @@ -86,7 +77,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index eb576f0e19..b5e0efe27c 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -39,7 +39,6 @@ "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "50" }, "speed_print": { "default_value": 50 }, - "speed_travel": { "default_value": 70 }, "machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_y": { "default_value": 600 }, "machine_max_acceleration_z": { "default_value": 30 }, @@ -50,9 +49,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} ; Preheat\nM109 S{material_print_temperature} ; Preheat\nG91 ;relative positioning\nG90 ;absolute positioning\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, - "material_print_temperature": { "default_value": 202 }, "wall_thickness": { "default_value": 1 }, - "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { "default_value": 1 } + "top_bottom_thickness": { "default_value": 1 } } } diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 40a3dde303..89ffda490a 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -37,7 +37,6 @@ "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "50" }, "speed_print": { "default_value": 50 }, - "speed_travel": { "default_value": 70 }, "machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_y": { "default_value": 600 }, "machine_max_acceleration_z": { "default_value": 30 }, @@ -48,9 +47,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} T0 ; Preheat Left Extruder\nM104 S{material_print_temperature} T1 ; Preheat Right Extruder\nM109 S{material_print_temperature} T0 ; Preheat Left Extruder\nM109 S{material_print_temperature} T1 ; Preheat Right Extruder\nG91 ;relative positioning\nG90 ;absolute positioning\nM218 T1 X34.3 Y0; Set 2nd extruder offset. This can be changed later if needed\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { "default_value": "M104 S0 T0;Left extruder off\nM104 S0 T1; Right extruder off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, - "material_print_temperature": { "default_value": 202 }, "wall_thickness": { "default_value": 1 }, - "top_bottom_thickness": { "default_value": 1 }, - "bottom_thickness": { "default_value": 1 } + "top_bottom_thickness": { "default_value": 1 } } } diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 65716ac175..2c8c4839d0 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -26,28 +26,15 @@ "machine_height": { "default_value": 190 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "material_print_temperature": { "default_value": 200 }, - "material_bed_temperature": { "default_value": 60 }, - "line_width": { "default_value": 0.48 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "wall_line_count": { "default_value": 3 }, "wall_thickness": { "default_value": 1.2 }, "top_bottom_thickness": { "default_value": 1.2 }, "infill_sparse_density": { "default_value": 20 }, - "infill_overlap": { "default_value": 15 }, "speed_print": { "default_value": 60 }, - "speed_travel": { "default_value": 160 }, - "speed_layer_0": { "default_value": 30 }, - "speed_wall_x": { "default_value": 35 }, - "speed_wall_0": { "default_value": 30 }, - "speed_infill": { "default_value": 60 }, - "speed_topbottom": { "default_value": 20 }, - "skirt_brim_speed": { "default_value": 35 }, "skirt_line_count": { "default_value": 4 }, "skirt_brim_minimal_length": { "default_value": 30 }, "skirt_gap": { "default_value": 6 }, - "cool_fan_full_at_height": { "default_value": 0.4 }, "retraction_speed": { "default_value": 15.0}, "retraction_amount": { "default_value": 1.5} } diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 72a9ec3edb..13a8a7c59b 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -61,36 +61,10 @@ "top_bottom_thickness": { "default_value": 1.2 }, - "material_print_temperature": { - "default_value": 205 - }, - "material_bed_temperature": { - "default_value": 60 - }, "speed_print": { "default_value": 50 }, - "speed_wall_0": { - "default_value": 25 - }, - "speed_wall_x": { - "default_value": 40 - }, - "speed_infill": { - "default_value": 80 - }, - "speed_topbottom": { - "default_value": 30 - }, - "speed_support_interface": - { - "default_value": 20 - }, - "speed_travel": { - "default_value": 150 - }, "speed_layer_0": { - "default_value": 30.0, "minimum_value": 0.1 } } diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json index 3c9f9c61e9..1c910f0d95 100644 --- a/resources/definitions/jgaurora_a1.def.json +++ b/resources/definitions/jgaurora_a1.def.json @@ -47,12 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 215 - }, - "material_bed_temperature": { - "default_value": 67 - }, "layer_height_0": { "default_value": 0.12 }, @@ -62,21 +56,6 @@ "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 12 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/jgaurora_a3s.def.json b/resources/definitions/jgaurora_a3s.def.json index bd8d0bd0e3..ead0a5f9e7 100644 --- a/resources/definitions/jgaurora_a3s.def.json +++ b/resources/definitions/jgaurora_a3s.def.json @@ -47,12 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 210 - }, - "material_bed_temperature": { - "default_value": 65 - }, "layer_height_0": { "default_value": 0.12 }, @@ -62,21 +56,6 @@ "speed_print": { "default_value": 35 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 30 - }, - "speed_topbottom": { - "default_value": 20 - }, - "speed_travel": { - "default_value": 100 - }, - "speed_layer_0": { - "default_value": 12 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/jgaurora_a5.def.json b/resources/definitions/jgaurora_a5.def.json index e02fca881b..b9f179d38e 100644 --- a/resources/definitions/jgaurora_a5.def.json +++ b/resources/definitions/jgaurora_a5.def.json @@ -49,12 +49,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 215 - }, - "material_bed_temperature": { - "default_value": 67 - }, "layer_height_0": { "default_value": 0.12 }, @@ -64,21 +58,6 @@ "speed_print": { "default_value": 40 }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 12 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/jgaurora_jgmaker_magic.def.json b/resources/definitions/jgaurora_jgmaker_magic.def.json index 703305151a..8d0349a48c 100644 --- a/resources/definitions/jgaurora_jgmaker_magic.def.json +++ b/resources/definitions/jgaurora_jgmaker_magic.def.json @@ -47,12 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 200 - }, - "material_bed_temperature": { - "default_value": 60 - }, "layer_height_0": { "default_value": 0.2 }, @@ -62,21 +56,6 @@ "speed_print": { "default_value": 60 }, - "speed_infill": { - "default_value": 60 - }, - "speed_wall": { - "default_value": 30 - }, - "speed_topbottom": { - "default_value": 45 - }, - "speed_travel": { - "default_value": 125 - }, - "speed_layer_0": { - "default_value": 30 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index ceade3243a..8dbf5a82bb 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -22,7 +22,7 @@ }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, + }, "machine_width": { "default_value": 280 }, @@ -47,12 +47,6 @@ "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "default_value": 210 - }, - "material_bed_temperature": { - "default_value": 55 - }, "layer_height_0": { "default_value": 0.2 }, @@ -62,21 +56,6 @@ "speed_print": { "default_value": 60 }, - "speed_infill": { - "default_value": 60 - }, - "speed_wall": { - "default_value": 30 - }, - "speed_topbottom": { - "default_value": 45 - }, - "speed_travel": { - "default_value": 125 - }, - "speed_layer_0": { - "default_value": 20 - }, "support_enable": { "default_value": true }, diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 62e4170c1f..15e5057a55 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -21,25 +21,14 @@ "machine_end_gcode": { "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, - "material_bed_temperature": { "default_value": 100 }, "layer_height": { "default_value": 0.2 }, "support_angle": { "default_value": 30 }, - "infill_overlap": { "default_value": 30 }, "layer_height_0": { "default_value": 0.2 }, "speed_print": { "default_value": 80 }, - "speed_wall_0": { "default_value": 30 }, - "speed_travel": { "default_value": 150 }, - "brim_line_count": { "default_value": 15 }, - "skin_overlap": { "default_value": 30 }, "prime_tower_size": { "default_value": 8.660254037844387 }, - "bottom_thickness": { "default_value": 0.8 }, "retraction_amount": { "default_value": 3 }, - "speed_topbottom": { "default_value": 80 }, - "material_print_temperature": { "default_value": 230 }, "support_pattern": { "default_value": "grid" }, - "speed_infill": { "default_value": 80 }, "infill_sparse_density": { "default_value": 10 }, - "top_thickness": { "default_value": 0.8 }, "machine_extruder_count": { "default_value": 1 }, "retraction_combing": { "default_value": "off" }, "machine_heated_bed": { "default_value": true }, diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 5d09189de8..d601a5c309 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -77,27 +77,12 @@ "retraction_amount": { "default_value": 6 }, - "retraction_min_travel": { - "default_value": 1.5 - }, - "speed_travel": { - "default_value": 150 - }, "speed_print": { "default_value": 60 }, "wall_thickness": { "default_value": 1.2 }, - "bottom_thickness": { - "default_value": 0.2 - }, - "speed_layer_0": { - "default_value": 20 - }, - "speed_print_layer_0": { - "default_value": 20 - }, "cool_min_layer_time_fan_speed_max": { "default_value": 5 }, diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 57e2a7dbd4..267646b647 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -77,27 +77,12 @@ "retraction_amount": { "default_value": 6 }, - "retraction_min_travel": { - "default_value": 1.5 - }, - "speed_travel": { - "default_value": 150 - }, "speed_print": { "default_value": 60 }, "wall_thickness": { "default_value": 1.2 }, - "bottom_thickness": { - "default_value": 0.2 - }, - "speed_layer_0": { - "default_value": 20 - }, - "speed_print_layer_0": { - "default_value": 20 - }, "cool_min_layer_time_fan_speed_max": { "default_value": 5 }, diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 560e53ccb9..96dca118af 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -53,57 +53,15 @@ "layer_height_0": { "default_value": 0.2 }, - "wall_line_count": { - "default_value": 2 - }, - "top_layers": { - "default_value": 4 - }, - "bottom_layers": { - "default_value": 4 - }, "speed_print": { "default_value": 50 }, - "speed_wall": { - "default_value": 30 - }, - "speed_wall_0": { - "default_value": 30 - }, - "speed_wall_x": { - "default_value": 30 - }, - "speed_topbottom": { - "default_value": 50 - }, - "speed_support": { - "default_value": 50 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 20 - }, - "skirt_brim_speed": { - "default_value": 15 - }, "speed_slowdown_layers": { "default_value": 4 }, "infill_sparse_density": { "default_value": 20 }, - "cool_fan_speed_min": { - "default_value": 50 - }, - "cool_fan_speed_max": { - "default_value": 100 - }, - "cool_fan_full_layer": { - "default_value": 4 - }, "cool_min_layer_time": { "default_value": 5 }, @@ -122,12 +80,6 @@ "support_z_distance": { "default_value": 0.2 }, - "support_top_distance": { - "default_value": 0.2 - }, - "support_bottom_distance": { - "default_value": 0.24 - }, "support_pattern": { "default_value": "ZigZag" }, @@ -140,24 +92,6 @@ "skirt_brim_minimal_length": { "default_value": 100 }, - "raft_base_line_spacing": { - "default_value": 2 - }, - "raft_base_thickness": { - "default_value": 0.3 - }, - "raft_base_line_width": { - "default_value": 2 - }, - "raft_base_speed": { - "default_value": 15 - }, - "raft_interface_thickness": { - "default_value": 0.24 - }, - "raft_interface_line_width": { - "default_value": 0.6 - }, "raft_airgap": { "default_value": 0.2 }, diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 3b02215e74..24b556e1ee 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -18,9 +18,7 @@ "overrides": { "prime_tower_size": { "default_value": 10.0 }, "infill_sparse_density": { "default_value": 10 }, - "speed_travel": { "default_value": 150 }, "layer_height": { "default_value": 0.15 }, - "material_print_temperature": { "default_value": 220 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 71c94184b2..13ad07ccae 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -30,8 +30,6 @@ "speed_wall_x": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" }, - "speed_travel": { "default_value": 50 }, - "speed_travel_layer_0": { "default_value": 40 }, "speed_infill": { "value": "speed_print" }, "speed_topbottom": {"value": "speed_print / 2"}, diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index 104be7091b..b6fa040750 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -41,23 +41,15 @@ "layer_height": { "default_value": 0.2 }, "wall_thickness": { "default_value": 0.8 }, "top_bottom_thickness": { "default_value": 0.3 }, - "material_print_temperature": { "default_value": 195 }, - "material_bed_temperature": { "default_value": 60 }, "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 50 }, "retraction_amount": { "default_value": 0.8 }, "retraction_hop": { "default_value": 0.075 }, "speed_print": { "default_value": 60 }, - "speed_infill": { "default_value": 100 }, - "speed_topbottom": { "default_value": 15 }, - "speed_travel": { "default_value": 150 }, "speed_layer_0": { - "minimum_value": "0.1", - "default_value": 15.0 + "minimum_value": "0.1" }, - "infill_overlap": { "default_value": 10 }, "cool_fan_enabled": { "default_value": false }, - "cool_fan_speed": { "default_value": 0 }, "skirt_line_count": { "default_value": 3 }, "skirt_gap": { "default_value": 4 }, "skirt_brim_minimal_length": { "default_value": 200 } diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index de410b0d58..4a550602f2 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -19,12 +19,9 @@ }, "overrides": { - "material_bed_temperature": { "default_value": 60 }, "prime_tower_size": { "default_value": 7.0710678118654755 }, "infill_sparse_density": { "default_value": 15 }, - "speed_travel": { "default_value": 150 }, "layer_height": { "default_value": 0.3 }, - "material_print_temperature": { "default_value": 240 }, "machine_extruder_count": { "default_value": 5 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index b8879e825c..bf52363800 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -29,7 +29,6 @@ "machine_head_with_fans_polygon": { "default_value": [[-32,999],[37,999],[37,-32],[-32,-32]] }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 50 }, - "speed_travel": { "default_value": 55 }, "machine_max_feedrate_x": {"default_value": 125}, "machine_max_feedrate_y": {"default_value": 125}, "machine_max_feedrate_z": { "default_value": 5 }, diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index ff6f4469e7..5ae541049d 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -22,13 +22,10 @@ "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 210 }, "machine_center_is_zero": { "default_value": false }, - "material_bed_temperature": { "default_value": 55 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.15 }, "retraction_amount": { "default_value": 0.8 }, "retraction_speed": { "default_value": 35 }, - "retraction_retract_speed": { "default_value": 35 }, - "retraction_prime_speed": { "default_value": 35 }, "adhesion_type": { "default_value": "skirt" }, "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, "gantry_height": { "value": "28" }, diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 1efdd226fd..b262daa445 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -17,15 +17,9 @@ "overrides": { "machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, - "speed_travel": { "default_value": 150 }, "prime_tower_size": { "default_value": 8.660254037844387 }, - "speed_wall_x": { "default_value": 40 }, - "speed_wall_0": { "default_value": 40 }, - "speed_topbottom": { "default_value": 40 }, "layer_height": { "default_value": 0.2 }, - "material_print_temperature": { "default_value": 195 }, "speed_print": { "default_value": 40 }, - "speed_infill": { "default_value": 40 }, "machine_extruder_count": { "default_value": 2 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index 43ffd6924a..a66559b393 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -25,23 +25,13 @@ "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, - "speed_wall_x": { "default_value": 40 }, - "speed_travel": { "default_value": 100 }, - "bottom_thickness": { "default_value": 0.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, - "material_bed_temperature": { "default_value": 100 }, - "top_thickness": { "default_value": 0.75 }, - "material_print_temperature": { "default_value": 235 }, "retraction_speed": { "default_value": 60.0 }, "wall_thickness": { "default_value": 0.8 }, - "retraction_min_travel": { "default_value": 2 }, - "speed_wall_0": { "default_value": 30 }, "retraction_amount": { "default_value": 1 }, - "speed_topbottom": { "default_value": 30 }, "layer_height": { "default_value": 0.25 }, "speed_print": { "default_value": 40 }, - "speed_infill": { "default_value": 40 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index bb3414b75d..b4d0252075 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -25,20 +25,12 @@ "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_gap": { "default_value": 5.0 }, - "speed_travel": { "default_value": 120 }, - "bottom_thickness": { "default_value": 0.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, - "material_bed_temperature": { "default_value": 100 }, - "retraction_min_travel": { "default_value": 2 }, - "speed_wall_0": { "default_value": 30 }, "retraction_speed": { "default_value": 60.0 }, "wall_thickness": { "default_value": 0.8 }, - "material_print_temperature": { "default_value": 235 }, "retraction_amount": { "default_value": 1 }, - "speed_topbottom": { "default_value": 25 }, "layer_height": { "default_value": 0.25 }, - "top_thickness": { "default_value": 0.75 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index db48195fe0..f50df0c47d 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -17,25 +17,17 @@ "overrides": { "machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, "prime_tower_size": { "default_value": 8.660254037844387 }, - "speed_travel": { "default_value": 40 }, "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 15 }, "support_pattern": { "default_value": "grid" }, "layer_height_0": { "default_value": 0.25 }, - "speed_wall_x": { "default_value": 30 }, "skirt_line_count": { "default_value": 2 }, "support_angle": { "default_value": 45 }, - "speed_topbottom": { "default_value": 20 }, - "material_print_temperature": { "default_value": 205 }, "retraction_speed": { "default_value": 80 }, "wall_thickness": { "default_value": 0.8 }, - "retraction_min_travel": { "default_value": 2 }, - "speed_wall_0": { "default_value": 20 }, "retraction_amount": { "default_value": 2 }, - "speed_layer_0": { "default_value": 15 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 30 }, - "speed_infill": { "default_value": 30 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": false }, diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index 42cd99a3bd..75853fab8b 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -76,14 +76,9 @@ "default_value": true }, "cool_fan_speed": { - "default_value": 100, "value": "100" }, - "cool_fan_speed_min": { - "default_value": 0 - }, "cool_fan_full_at_height": { - "default_value": 0.5, "value": "0.5" }, "support_z_distance": { diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index f55f913a56..64909630d2 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -24,21 +24,11 @@ "machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, "support_pattern": { "default_value": "grid" }, "cool_min_layer_time": { "default_value": 10 }, - "speed_travel": { "default_value": 80 }, "support_angle": { "default_value": 45 }, - "retraction_min_travel": { "default_value": 2 }, - "speed_wall_0": { "default_value": 20 }, - "speed_layer_0": { "default_value": 15 }, - "speed_infill": { "default_value": 30 }, - "speed_topbottom": { "default_value": 30 }, "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_line_count": { "default_value": 2 }, - "speed_wall_x": { "default_value": 30 }, - "bottom_thickness": { "default_value": 0.75 }, "layer_height_0": { "default_value": 0.25 }, - "top_thickness": { "default_value": 0.75 }, "wall_thickness": { "default_value": 0.8 }, - "material_print_temperature": { "default_value": 195 }, "retraction_amount": { "default_value": 1.5 }, "skirt_gap": { "default_value": 5.0 }, "layer_height": { "default_value": 0.25 }, diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index f24c869636..cc922769f7 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -44,9 +44,6 @@ "material_print_temperature": { "value": 235 }, - "material_bed_temperature": { - "default_value": 100 - }, "speed_print": { "default_value": 40 }, @@ -55,7 +52,7 @@ }, "speed_travel": { "value": 100 - }, + }, "support_enable": { "default_value": false }, @@ -90,14 +87,9 @@ "default_value": false }, "cool_fan_speed": { - "default_value": 50, "value": 50 }, - "cool_fan_speed_min": { - "default_value": 0 - }, "cool_fan_full_at_height": { - "default_value": 1.0, "value": 1.0 }, "support_z_distance": { diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index c04cd7c5e6..d6fb4f1651 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -49,37 +49,15 @@ "top_bottom_thickness": { "default_value": 0.3 }, - "material_print_temperature": { - "default_value": 195 - }, - "material_bed_temperature": { - "default_value": 60 - }, "speed_print": { "default_value": 60 }, - "speed_infill": { - "default_value": 100 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, "speed_layer_0": { - "default_value": 15, "minimum_value": "0.1" }, - "infill_overlap": { - "default_value": 10 - }, "cool_fan_enabled": { "default_value": false }, - "cool_fan_speed": { - "default_value": 0 - }, "skirt_line_count": { "default_value": 3 }, diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index c97c6df9f3..9568417acc 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -49,37 +49,15 @@ "top_bottom_thickness": { "default_value": 0.3 }, - "material_print_temperature": { - "default_value": 195 - }, - "material_bed_temperature": { - "default_value": 60 - }, "speed_print": { "default_value": 60 }, - "speed_infill": { - "default_value": 100 - }, - "speed_topbottom": { - "default_value": 15 - }, - "speed_travel": { - "default_value": 150 - }, "speed_layer_0": { - "default_value": 15, "minimum_value": "0.1" }, - "infill_overlap": { - "default_value": 10 - }, "cool_fan_enabled": { "default_value": false }, - "cool_fan_speed": { - "default_value": 0 - }, "skirt_line_count": { "default_value": 3 }, diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 8d7698e198..36b8addd27 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -22,28 +22,16 @@ "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, "cool_min_layer_time": { "default_value": 7 }, - "speed_topbottom": { "default_value": 40 }, "retraction_speed": { "default_value": 50 }, - "layer_0_z_overlap": { "default_value": 0.2 }, "cool_min_speed": { "default_value": 19 }, - "material_bed_temperature": { "default_value": 60 }, "support_angle": { "default_value": 50 }, - "speed_layer_0": { "default_value": 30 }, - "line_width": { "default_value": 0.4 }, - "speed_infill": { "default_value": 60 }, "prime_tower_size": { "default_value": 8.660254037844387 }, "support_enable": { "default_value": true }, - "cool_fan_full_at_height": { "default_value": 0.1 }, - "bottom_thickness": { "default_value": 1.2 }, "raft_airgap": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.15 }, - "top_thickness": { "default_value": 1.2 }, - "speed_wall_0": { "default_value": 40 }, - "retraction_min_travel": { "default_value": 5 }, "material_flow": { "default_value": 100 }, "infill_sparse_density": { "default_value": 10 }, "wall_thickness": { "default_value": 1.2 }, - "material_print_temperature": { "default_value": 190 }, "retraction_amount": { "default_value": 3 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/seemecnc_artemis.def.json b/resources/definitions/seemecnc_artemis.def.json index ec92f528d7..88c1d84b3d 100644 --- a/resources/definitions/seemecnc_artemis.def.json +++ b/resources/definitions/seemecnc_artemis.def.json @@ -27,13 +27,11 @@ "machine_name": { "default_value": "Artemis" }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 290 }, - "relative_extrusion": { "default_value": false }, + "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_prime_speed": { "default_value": 45 }, - "retraction_retract_speed": { "default_value": 45 }, "retraction_speed": { "default_value": 45 }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" diff --git a/resources/definitions/seemecnc_v32.def.json b/resources/definitions/seemecnc_v32.def.json index d4316c25d9..0f49410116 100644 --- a/resources/definitions/seemecnc_v32.def.json +++ b/resources/definitions/seemecnc_v32.def.json @@ -27,13 +27,11 @@ "machine_name": { "default_value": "Rostock Max V3.2" }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 265 }, - "relative_extrusion": { "default_value": false }, + "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_prime_speed": { "default_value": 45 }, - "retraction_retract_speed": { "default_value": 45 }, "retraction_speed": { "default_value": 45 }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index a3710fb9af..4ae8473285 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -32,7 +32,7 @@ "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, - "gantry_height": { "default_value": 40 }, + "gantry_height": { "value": "40" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index a7f4b7e549..e4893cacac 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -55,9 +55,6 @@ "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "speed_layer_0": { - "default_value": 10 - }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 67a4bb8eab..211049ca3d 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -37,7 +37,6 @@ "machine_center_is_zero": { "default_value": false }, "speed_print": { "default_value": 60 }, - "speed_travel": { "default_value": 200 }, "retraction_amount": { "default_value": 0.4 }, "retraction_speed": { "default_value": 35}, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index f92f679677..57c7337196 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -50,13 +50,8 @@ "fill_outline_gaps": { "default_value": true}, "infill_sparse_density": { "default_value": 15}, "retraction_amount": { "default_value": 2.5}, - "retraction_min_travel": { "default_value": 2}, "retraction_speed": { "default_value": 30}, "speed_print": { "default_value": 60}, - "speed_topbottom": { "default_value": 50}, - "speed_wall_0": { "default_value": 40}, - "top_layers": { "default_value": 4}, - "wall_line_count": { "default_value": 2}, "cool_min_layer_time": { "default_value": 11}, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 060752387b..5157befc10 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -24,12 +24,9 @@ "machine_height": { "default_value": 275 }, "machine_depth": { "default_value": 275 }, "machine_center_is_zero": { "default_value": false }, - "material_bed_temperature": { "default_value": 70 }, "layer_height_0": { "default_value": 0.1 }, "retraction_amount": { "default_value": 2 }, "retraction_speed": { "default_value": 50 }, - "retraction_retract_speed": { "default_value": 50 }, - "retraction_prime_speed": { "default_value": 30 }, "adhesion_type": { "default_value": "skirt" }, "machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index bb1ab13196..40fbdaf709 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -88,9 +88,6 @@ }, "machine_acceleration": { "default_value": 3000 - }, - "machine_nozzle_temp_enabled": { - "default_value": false } } } diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 65ee8f063b..633e50bdba 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -37,9 +37,6 @@ "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "speed_layer_0": { - "default_value": 20 - }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index 6bba095978..dad50cffe8 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -20,12 +20,6 @@ "machine_heated_bed": { "default_value": true }, - "material_bed_temperature": { - "default_value": 0 - }, - "material_bed_temperature_layer_0": { - "default_value": 0 - }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index 9d014b9cf8..f5c4921cfc 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -18,12 +18,6 @@ "machine_heated_bed": { "default_value": true }, - "material_bed_temperature": { - "default_value": 0 - }, - "material_bed_temperature_layer_0": { - "default_value": 0 - }, "machine_width": { "default_value": 223.7 }, diff --git a/resources/definitions/vertex_nano_k8600.def.json b/resources/definitions/vertex_nano_k8600.def.json index 02697a1152..ef9552caf3 100644 --- a/resources/definitions/vertex_nano_k8600.def.json +++ b/resources/definitions/vertex_nano_k8600.def.json @@ -19,12 +19,6 @@ "machine_heated_bed": { "default_value": false }, - "material_bed_temperature": { - "default_value": 0 - }, - "material_bed_temperature_layer_0": { - "default_value": 0 - }, "machine_width": { "default_value": 80 }, diff --git a/resources/definitions/wanhao_d9.def.json b/resources/definitions/wanhao_d9.def.json index 39ad139ff8..ac4d41fa40 100644 --- a/resources/definitions/wanhao_d9.def.json +++ b/resources/definitions/wanhao_d9.def.json @@ -31,8 +31,6 @@ "support_angle": { "default_value": 60 }, "support_enable": { "default_value": true }, "layer_height_0": { "default_value": 0.15 }, - "top_thickness": { "default_value": 0.6 }, - "material_print_temperature": { "default_value": 190 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 30 }, "adhesion_type": { "default_value": "raft" }, diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index 5aa015cace..4c72422788 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -16,9 +16,7 @@ "overrides": { "prime_tower_size": { "default_value": 10.350983390135314 }, - "material_print_temperature": { "default_value": 260 }, "layer_height": { "default_value": 0.14 }, - "speed_travel": { "default_value": 150 }, "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, From 8cd583ad33940af8b5afbf4c6fde1b01356ac17a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 21 Oct 2019 01:48:01 +0200 Subject: [PATCH 692/994] Only show conical support min width if angle is positive If the angle is 0 or negative, this setting won't have any effect since the support cannot be made wider than it already is using this setting. It can only prevent it from becoming smaller, and it will only become smaller from a positive conical support angle. Discovered during work on the Settings Guide. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5f43cb0bfd..019f533cf8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6607,7 +6607,7 @@ "minimum_value_warning": "machine_nozzle_size * 3", "maximum_value_warning": "100.0", "type": "float", - "enabled": "support_conical_enabled and support_enable", + "enabled": "support_conical_enabled and support_enable and support_conical_angle > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true }, From 5149baf5932f0abb02af040bce1ecd6b0dcde96a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 21 Oct 2019 09:06:04 +0200 Subject: [PATCH 693/994] Fix custom quality fetching CURA-6913 --- cura/Machines/Models/QualityManagementModel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 3b503edcf0..d8b0785778 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -345,11 +345,13 @@ class QualityManagementModel(ListModel): # Create quality_changes group items quality_changes_item_list = [] for quality_changes_group in quality_changes_group_list: + # CURA-6913 Note that custom qualities can be based on "not supported", so the quality group can be None. quality_group = quality_group_dict.get(quality_changes_group.quality_type) + quality_type = quality_changes_group.quality_type item = {"name": quality_changes_group.name, "is_read_only": False, "quality_group": quality_group, - "quality_type": quality_group.quality_type, + "quality_type": quality_type, "quality_changes_group": quality_changes_group, "intent_category": quality_changes_group.intent_category, "section_name": catalog.i18nc("@label", "Custom profiles"), From cd0dbb390214e61c844a6e0ef7c9de6255a79047 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 21 Oct 2019 09:22:38 +0200 Subject: [PATCH 694/994] Fix defaultExtruderPosition() usage in fdmprinter CURA-6913 getDefaultValueInExtruder() expects the extruder_position to be an int, but defaultExtruderPosition() returns a str. This will cause the formula evaluation to fail. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 019f533cf8..ab5a41344a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4083,7 +4083,7 @@ "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", - "value": "defaultExtruderPosition()", + "value": "int(defaultExtruderPosition())", "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false, @@ -5050,7 +5050,7 @@ "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", - "value": "defaultExtruderPosition()", + "value": "int(defaultExtruderPosition())", "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))", "settable_per_mesh": false, "settable_per_extruder": false From 5602c71ec7f54af0e9cbeb432f54062164710f1b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 21 Oct 2019 09:53:12 +0200 Subject: [PATCH 695/994] Fix material model update and signal recursion CURA-6904 --- cura/Machines/Models/BaseMaterialsModel.py | 38 +++++++++++++------ .../Machines/Models/FavoriteMaterialsModel.py | 4 +- cura/Machines/Models/GenericMaterialsModel.py | 2 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index fc2f90f1e4..3ed23a2c9e 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -1,9 +1,9 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict, Set +from typing import Dict, Set -from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty +from PyQt5.QtCore import Qt, QTimer, pyqtSignal, pyqtProperty from UM.Qt.ListModel import ListModel @@ -38,14 +38,25 @@ class BaseMaterialsModel(ListModel): self._extruder_stack = None self._enabled = True + # CURA-6904 + # Updating the material model requires information from material nodes and containers. We use a timer here to + # make sure that an update function call will not be directly invoked by an event. Because the triggered event + # can be caused in the middle of a XMLMaterial loading, and the material container we try to find may not be + # in the system yet. This will cause an infinite recursion of (1) trying to load a material, (2) trying to + # update the material model, (3) cannot find the material container, load it, (4) repeat #1. + self._update_timer = QTimer() + self._update_timer.setInterval(100) + self._update_timer.setSingleShot(True) + self._update_timer.timeout.connect(self._update) + # Update the stack and the model data when the machine changes self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack) self._updateExtruderStack() # Update this model when switching machines, when adding materials or changing their metadata. - self._machine_manager.activeStackChanged.connect(self._update) + self._machine_manager.activeStackChanged.connect(self._onChanged) ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged) - self._application.getMaterialManagementModel().favoritesChanged.connect(self._update) + self._application.getMaterialManagementModel().favoritesChanged.connect(self._onChanged) self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") @@ -64,14 +75,17 @@ class BaseMaterialsModel(ListModel): self.addRoleName(Qt.UserRole + 15, "container_node") self.addRoleName(Qt.UserRole + 16, "is_favorite") + def _onChanged(self) -> None: + self._update_timer.start() + def _updateExtruderStack(self): global_stack = self._machine_manager.activeMachine if global_stack is None: return if self._extruder_stack is not None: - self._extruder_stack.pyqtContainersChanged.disconnect(self._update) - self._extruder_stack.approximateMaterialDiameterChanged.disconnect(self._update) + self._extruder_stack.pyqtContainersChanged.disconnect(self._onChanged) + self._extruder_stack.approximateMaterialDiameterChanged.disconnect(self._onChanged) try: self._extruder_stack = global_stack.extruderList[self._extruder_position] @@ -79,10 +93,10 @@ class BaseMaterialsModel(ListModel): self._extruder_stack = None if self._extruder_stack is not None: - self._extruder_stack.pyqtContainersChanged.connect(self._update) - self._extruder_stack.approximateMaterialDiameterChanged.connect(self._update) + self._extruder_stack.pyqtContainersChanged.connect(self._onChanged) + self._extruder_stack.approximateMaterialDiameterChanged.connect(self._onChanged) # Force update the model when the extruder stack changes - self._update() + self._onChanged() def setExtruderPosition(self, position: int): if self._extruder_stack is None or self._extruder_position != position: @@ -99,7 +113,7 @@ class BaseMaterialsModel(ListModel): self._enabled = enabled if self._enabled: # ensure the data is there again. - self._update() + self._onChanged() self.enabledChanged.emit() @pyqtProperty(bool, fset = setEnabled, notify = enabledChanged) @@ -119,12 +133,12 @@ class BaseMaterialsModel(ListModel): return if material.variant.machine.container_id != global_stack.definition.getId(): return - self._update() + self._onChanged() ## Triggered when the list of favorite materials is changed. def _favoritesChanged(self, material_base_file: str) -> None: if material_base_file in self._available_materials: - self._update() + self._onChanged() ## This is an abstract method that needs to be implemented by the specific # models themselves. diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index 255ef1dc0a..c5b245e400 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -9,14 +9,14 @@ class FavoriteMaterialsModel(BaseMaterialsModel): def __init__(self, parent = None): super().__init__(parent) cura.CuraApplication.CuraApplication.getInstance().getPreferences().preferenceChanged.connect(self._onFavoritesChanged) - self._update() + self._onChanged() ## Triggered when any preference changes, but only handles it when the list # of favourites is changed. def _onFavoritesChanged(self, preference_key: str) -> None: if preference_key != "cura/favorite_materials": return - self._update() + self._onChanged() def _update(self): if not self._canUpdate(): diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index 2542a6412a..00adf5636a 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -7,7 +7,7 @@ class GenericMaterialsModel(BaseMaterialsModel): def __init__(self, parent = None): super().__init__(parent) - self._update() + self._onChanged() def _update(self): if not self._canUpdate(): From 5548c30616e84aa6480ac6f0ed469ba88a759927 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 21 Oct 2019 10:21:48 +0200 Subject: [PATCH 696/994] Catch WinErrors for zeroconf CURA-6855 --- .../UM3NetworkPrinting/src/Network/ZeroConfClient.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py index b6416b2bd0..0446af177b 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py @@ -36,9 +36,15 @@ class ZeroConfClient: def start(self) -> None: self._service_changed_request_queue = Queue() self._service_changed_request_event = Event() - self._service_changed_request_thread = Thread(target=self._handleOnServiceChangedRequests, daemon=True) + try: + self._zero_conf = Zeroconf() + # CURA-6855 catch WinErrors + except OSError: + Logger.logException("e", "Failed to create zeroconf instance.") + return + + self._service_changed_request_thread = Thread(target = self._handleOnServiceChangedRequests, daemon = True) self._service_changed_request_thread.start() - self._zero_conf = Zeroconf() self._zero_conf_browser = ServiceBrowser(self._zero_conf, self.ZERO_CONF_NAME, [self._queueService]) # Cleanup ZeroConf resources. From b2f9dc612d3fe4a08caafaf9d5942421d9f06d09 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 21 Oct 2019 10:33:52 +0200 Subject: [PATCH 697/994] Change intent profile descriptions to not trigger pervs and prudes. CURA-6851 --- cura/Machines/Models/IntentCategoryModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 8e7cd0fb5f..70165a33f1 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -37,12 +37,12 @@ class IntentCategoryModel(ListModel): } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "A profile which is suitable for engineering work") + "description": catalog.i18nc("@text", "Suitable for engineering work") } _translations["smooth"] = { "name": catalog.i18nc("@label", "Smooth"), - "description": catalog.i18nc("@text", "Ohhh yeah. So tender. So smooth. So Perfect.") + "description": catalog.i18nc("@text", "Optimized for a smooth surfaces") } ## Creates a new model for a certain intent category. From 3d30674465674aa3d75cdc98955056c4a3846dd0 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 21 Oct 2019 13:37:28 +0200 Subject: [PATCH 698/994] Clarify "reset quality button" purpose --- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index d1f7dd7de2..ae121e0349 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -55,7 +55,7 @@ Item } UM.SimpleButton { - id: customisedSettings + id: resetToDefaultQualityButton visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.MachineManager.hasCustomQuality height: visible ? UM.Theme.getSize("print_setup_icon").height : 0 From 9d931d8d2b91ab044d83d0e237e8a206765da997 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Oct 2019 14:24:52 +0200 Subject: [PATCH 699/994] Remove stray print statement CURA-6853 --- plugins/SimulationView/SimulationViewMainComponent.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 65621605df..cd7d108370 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -224,7 +224,6 @@ Item // Make sure the slider handlers show the correct value after switching views Component.onCompleted: { - print("safeArea: " + safeArea, "layerSliderSafeYMax", layerSliderSafeYMax) layerSlider.setLowerValue(UM.SimulationView.minimumLayer) layerSlider.setUpperValue(UM.SimulationView.currentLayer) } From c62ff262ed3dbdb70e288086c1c5603d038ff181 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 21 Oct 2019 14:34:21 +0200 Subject: [PATCH 700/994] Change SDK version to 7.0.0 CURA-6858 --- cura/ApplicationMetadata.py | 4 +- plugins/3MFReader/plugin.json | 2 +- plugins/3MFWriter/plugin.json | 2 +- plugins/AMFReader/plugin.json | 2 +- plugins/CuraEngineBackend/plugin.json | 2 +- plugins/CuraProfileReader/plugin.json | 2 +- plugins/CuraProfileWriter/plugin.json | 2 +- plugins/FirmwareUpdateChecker/plugin.json | 2 +- plugins/FirmwareUpdater/plugin.json | 2 +- plugins/GCodeGzReader/plugin.json | 2 +- plugins/GCodeGzWriter/plugin.json | 2 +- plugins/GCodeProfileReader/plugin.json | 2 +- plugins/GCodeReader/plugin.json | 2 +- plugins/GCodeWriter/plugin.json | 2 +- plugins/ImageReader/plugin.json | 2 +- plugins/LegacyProfileReader/plugin.json | 2 +- plugins/MachineSettingsAction/plugin.json | 2 +- plugins/ModelChecker/plugin.json | 2 +- plugins/MonitorStage/plugin.json | 14 +- plugins/PerObjectSettingsTool/plugin.json | 2 +- plugins/PostProcessingPlugin/plugin.json | 2 +- plugins/PrepareStage/plugin.json | 14 +- plugins/PreviewStage/plugin.json | 2 +- .../RemovableDriveOutputDevice/plugin.json | 2 +- plugins/SimulationView/plugin.json | 2 +- plugins/SliceInfoPlugin/plugin.json | 2 +- plugins/SolidView/plugin.json | 2 +- plugins/SupportEraser/plugin.json | 2 +- plugins/Toolbox/plugin.json | 2 +- plugins/TrimeshReader/plugin.json | 2 +- plugins/UFPReader/plugin.json | 2 +- plugins/UFPWriter/plugin.json | 2 +- plugins/UM3NetworkPrinting/plugin.json | 2 +- plugins/USBPrinting/plugin.json | 2 +- plugins/UltimakerMachineActions/plugin.json | 2 +- .../VersionUpgrade21to22/plugin.json | 2 +- .../VersionUpgrade22to24/plugin.json | 2 +- .../VersionUpgrade25to26/plugin.json | 2 +- .../VersionUpgrade26to27/plugin.json | 2 +- .../VersionUpgrade27to30/plugin.json | 2 +- .../VersionUpgrade30to31/plugin.json | 2 +- .../VersionUpgrade32to33/plugin.json | 2 +- .../VersionUpgrade33to34/plugin.json | 2 +- .../VersionUpgrade34to35/plugin.json | 2 +- .../VersionUpgrade35to40/plugin.json | 2 +- .../VersionUpgrade40to41/plugin.json | 2 +- .../VersionUpgrade41to42/plugin.json | 2 +- .../VersionUpgrade42to43/plugin.json | 2 +- .../VersionUpgrade43to44/plugin.json | 2 +- plugins/X3DReader/plugin.json | 2 +- plugins/XRayView/plugin.json | 2 +- plugins/XmlMaterialProfile/plugin.json | 2 +- resources/bundled_packages/cura.json | 196 +++++++++--------- 53 files changed, 163 insertions(+), 163 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 655df59c56..daa937197c 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -9,7 +9,7 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False -DEFAULT_CURA_SDK_VERSION = "6.3.0" +DEFAULT_CURA_SDK_VERSION = "7.0.0" try: from cura.CuraVersion import CuraAppName # type: ignore @@ -45,4 +45,4 @@ except ImportError: # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "6.3.0" +CuraSDKVersion = "7.0.0" diff --git a/plugins/3MFReader/plugin.json b/plugins/3MFReader/plugin.json index 5af21a7033..e366a5da72 100644 --- a/plugins/3MFReader/plugin.json +++ b/plugins/3MFReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for reading 3MF files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/3MFWriter/plugin.json b/plugins/3MFWriter/plugin.json index 3820ebd2e7..5c72072447 100644 --- a/plugins/3MFWriter/plugin.json +++ b/plugins/3MFWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for writing 3MF files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/AMFReader/plugin.json b/plugins/AMFReader/plugin.json index 599dc03c76..5e5b0f211b 100644 --- a/plugins/AMFReader/plugin.json +++ b/plugins/AMFReader/plugin.json @@ -3,5 +3,5 @@ "author": "fieldOfView", "version": "1.0.0", "description": "Provides support for reading AMF files.", - "api": "6.0.0" + "api": "7.0.0" } diff --git a/plugins/CuraEngineBackend/plugin.json b/plugins/CuraEngineBackend/plugin.json index 28f0e294e7..5482e3699e 100644 --- a/plugins/CuraEngineBackend/plugin.json +++ b/plugins/CuraEngineBackend/plugin.json @@ -2,7 +2,7 @@ "name": "CuraEngine Backend", "author": "Ultimaker B.V.", "description": "Provides the link to the CuraEngine slicing backend.", - "api": "6.0", + "api": "7.0", "version": "1.0.1", "i18n-catalog": "cura" } diff --git a/plugins/CuraProfileReader/plugin.json b/plugins/CuraProfileReader/plugin.json index 169fb43360..e1309b2d46 100644 --- a/plugins/CuraProfileReader/plugin.json +++ b/plugins/CuraProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing Cura profiles.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/CuraProfileWriter/plugin.json b/plugins/CuraProfileWriter/plugin.json index 9627c754d7..180376f266 100644 --- a/plugins/CuraProfileWriter/plugin.json +++ b/plugins/CuraProfileWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for exporting Cura profiles.", - "api": "6.0", + "api": "7.0", "i18n-catalog":"cura" } diff --git a/plugins/FirmwareUpdateChecker/plugin.json b/plugins/FirmwareUpdateChecker/plugin.json index 6c55d77fd8..34e26fb146 100644 --- a/plugins/FirmwareUpdateChecker/plugin.json +++ b/plugins/FirmwareUpdateChecker/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Checks for firmware updates.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/FirmwareUpdater/plugin.json b/plugins/FirmwareUpdater/plugin.json index c1034e5e42..2546263064 100644 --- a/plugins/FirmwareUpdater/plugin.json +++ b/plugins/FirmwareUpdater/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a machine actions for updating firmware.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/GCodeGzReader/plugin.json b/plugins/GCodeGzReader/plugin.json index d4f281682f..b3d52b1627 100644 --- a/plugins/GCodeGzReader/plugin.json +++ b/plugins/GCodeGzReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Reads g-code from a compressed archive.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/GCodeGzWriter/plugin.json b/plugins/GCodeGzWriter/plugin.json index b0e6f8d605..de59d1eda8 100644 --- a/plugins/GCodeGzWriter/plugin.json +++ b/plugins/GCodeGzWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Writes g-code to a compressed archive.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/GCodeProfileReader/plugin.json b/plugins/GCodeProfileReader/plugin.json index af1c2d1827..162c31ce35 100644 --- a/plugins/GCodeProfileReader/plugin.json +++ b/plugins/GCodeProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing profiles from g-code files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/GCodeReader/plugin.json b/plugins/GCodeReader/plugin.json index bbc94fa917..e34fefbdff 100644 --- a/plugins/GCodeReader/plugin.json +++ b/plugins/GCodeReader/plugin.json @@ -3,6 +3,6 @@ "author": "Victor Larchenko, Ultimaker", "version": "1.0.1", "description": "Allows loading and displaying G-code files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/GCodeWriter/plugin.json b/plugins/GCodeWriter/plugin.json index f3a95ddb78..457652bf3f 100644 --- a/plugins/GCodeWriter/plugin.json +++ b/plugins/GCodeWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Writes g-code to a file.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/ImageReader/plugin.json b/plugins/ImageReader/plugin.json index d966537d99..a5f03a540d 100644 --- a/plugins/ImageReader/plugin.json +++ b/plugins/ImageReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Enables ability to generate printable geometry from 2D image files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/LegacyProfileReader/plugin.json b/plugins/LegacyProfileReader/plugin.json index 2f5264ad37..f4f18becbf 100644 --- a/plugins/LegacyProfileReader/plugin.json +++ b/plugins/LegacyProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing profiles from legacy Cura versions.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/MachineSettingsAction/plugin.json b/plugins/MachineSettingsAction/plugin.json index d734c1adf5..cc1e5fb01e 100644 --- a/plugins/MachineSettingsAction/plugin.json +++ b/plugins/MachineSettingsAction/plugin.json @@ -3,6 +3,6 @@ "author": "fieldOfView", "version": "1.0.1", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/ModelChecker/plugin.json b/plugins/ModelChecker/plugin.json index 59be5bbf0a..6437fb0802 100644 --- a/plugins/ModelChecker/plugin.json +++ b/plugins/ModelChecker/plugin.json @@ -2,7 +2,7 @@ "name": "Model Checker", "author": "Ultimaker B.V.", "version": "1.0.1", - "api": "6.0", + "api": "7.0", "description": "Checks models and print configuration for possible printing issues and give suggestions.", "i18n-catalog": "cura" } diff --git a/plugins/MonitorStage/plugin.json b/plugins/MonitorStage/plugin.json index 95e4b86f36..2274351527 100644 --- a/plugins/MonitorStage/plugin.json +++ b/plugins/MonitorStage/plugin.json @@ -1,8 +1,8 @@ -{ - "name": "Monitor Stage", - "author": "Ultimaker B.V.", - "version": "1.0.1", - "description": "Provides a monitor stage in Cura.", - "api": "6.0", - "i18n-catalog": "cura" +{ + "name": "Monitor Stage", + "author": "Ultimaker B.V.", + "version": "1.0.1", + "description": "Provides a monitor stage in Cura.", + "api": "7.0", + "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/PerObjectSettingsTool/plugin.json b/plugins/PerObjectSettingsTool/plugin.json index f272abf06a..b30acfd52e 100644 --- a/plugins/PerObjectSettingsTool/plugin.json +++ b/plugins/PerObjectSettingsTool/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the Per Model Settings.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/PostProcessingPlugin/plugin.json b/plugins/PostProcessingPlugin/plugin.json index 1e73133c53..6a2b84933e 100644 --- a/plugins/PostProcessingPlugin/plugin.json +++ b/plugins/PostProcessingPlugin/plugin.json @@ -2,7 +2,7 @@ "name": "Post Processing", "author": "Ultimaker", "version": "2.2.1", - "api": "6.0", + "api": "7.0", "description": "Extension that allows for user created scripts for post processing", "catalog": "cura" } \ No newline at end of file diff --git a/plugins/PrepareStage/plugin.json b/plugins/PrepareStage/plugin.json index dc5c68ce16..e65c62ef49 100644 --- a/plugins/PrepareStage/plugin.json +++ b/plugins/PrepareStage/plugin.json @@ -1,8 +1,8 @@ -{ - "name": "Prepare Stage", - "author": "Ultimaker B.V.", - "version": "1.0.1", - "description": "Provides a prepare stage in Cura.", - "api": "6.0", - "i18n-catalog": "cura" +{ + "name": "Prepare Stage", + "author": "Ultimaker B.V.", + "version": "1.0.1", + "description": "Provides a prepare stage in Cura.", + "api": "7.0", + "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/PreviewStage/plugin.json b/plugins/PreviewStage/plugin.json index e1e4288bae..1c21e682ee 100644 --- a/plugins/PreviewStage/plugin.json +++ b/plugins/PreviewStage/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a preview stage in Cura.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/RemovableDriveOutputDevice/plugin.json b/plugins/RemovableDriveOutputDevice/plugin.json index 5523d6b1c1..c794257e3a 100644 --- a/plugins/RemovableDriveOutputDevice/plugin.json +++ b/plugins/RemovableDriveOutputDevice/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Provides removable drive hotplugging and writing support.", "version": "1.0.1", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/SimulationView/plugin.json b/plugins/SimulationView/plugin.json index 3ccf91b9e6..e444f1fa2e 100644 --- a/plugins/SimulationView/plugin.json +++ b/plugins/SimulationView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the Simulation view.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/SliceInfoPlugin/plugin.json b/plugins/SliceInfoPlugin/plugin.json index 8ff0e194fb..8975f52591 100644 --- a/plugins/SliceInfoPlugin/plugin.json +++ b/plugins/SliceInfoPlugin/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Submits anonymous slice info. Can be disabled through preferences.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/SolidView/plugin.json b/plugins/SolidView/plugin.json index b3f62221c5..716f2d8d89 100644 --- a/plugins/SolidView/plugin.json +++ b/plugins/SolidView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a normal solid mesh view.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/SupportEraser/plugin.json b/plugins/SupportEraser/plugin.json index fa6d6d230e..888c3df50d 100644 --- a/plugins/SupportEraser/plugin.json +++ b/plugins/SupportEraser/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Creates an eraser mesh to block the printing of support in certain places", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/Toolbox/plugin.json b/plugins/Toolbox/plugin.json index 61dc0429f5..0b967e1645 100644 --- a/plugins/Toolbox/plugin.json +++ b/plugins/Toolbox/plugin.json @@ -2,6 +2,6 @@ "name": "Toolbox", "author": "Ultimaker B.V.", "version": "1.0.1", - "api": "6.0", + "api": "7.0", "description": "Find, manage and install new Cura packages." } diff --git a/plugins/TrimeshReader/plugin.json b/plugins/TrimeshReader/plugin.json index 61c66aa5e8..dbe937b01d 100644 --- a/plugins/TrimeshReader/plugin.json +++ b/plugins/TrimeshReader/plugin.json @@ -3,5 +3,5 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Provides support for reading model files.", - "api": "6.0.0" + "api": "7.0.0" } diff --git a/plugins/UFPReader/plugin.json b/plugins/UFPReader/plugin.json index b56b555b36..a88a9c3ab0 100644 --- a/plugins/UFPReader/plugin.json +++ b/plugins/UFPReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Provides support for reading Ultimaker Format Packages.", - "supported_sdk_versions": ["6.0.0"], + "supported_sdk_versions": ["7.0.0"], "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/UFPWriter/plugin.json b/plugins/UFPWriter/plugin.json index 288d6acf77..35fd18f05e 100644 --- a/plugins/UFPWriter/plugin.json +++ b/plugins/UFPWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for writing Ultimaker Format Packages.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/plugin.json b/plugins/UM3NetworkPrinting/plugin.json index 039b412643..193ba63d83 100644 --- a/plugins/UM3NetworkPrinting/plugin.json +++ b/plugins/UM3NetworkPrinting/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Manages network connections to Ultimaker networked printers.", "version": "2.0.0", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/USBPrinting/plugin.json b/plugins/USBPrinting/plugin.json index 45971d858b..c05ea65f2d 100644 --- a/plugins/USBPrinting/plugin.json +++ b/plugins/USBPrinting/plugin.json @@ -2,7 +2,7 @@ "name": "USB printing", "author": "Ultimaker B.V.", "version": "1.0.2", - "api": "6.0", + "api": "7.0", "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "i18n-catalog": "cura" } diff --git a/plugins/UltimakerMachineActions/plugin.json b/plugins/UltimakerMachineActions/plugin.json index 3e3e0af9b0..e33d77c154 100644 --- a/plugins/UltimakerMachineActions/plugin.json +++ b/plugins/UltimakerMachineActions/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json index cad94c2eb5..547c1f9f4e 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json index 7da1e7a56d..51e3cd6794 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json index e1f0a47685..4a2c04ad8e 100644 --- a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json index 6cdbd64cbb..a72c5210f9 100644 --- a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json index 885d741a8c..787d03fdf3 100644 --- a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json index d5f22649c1..7303d576cc 100644 --- a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json index eb489169e0..a6f8f743e6 100644 --- a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json index 9649010643..4f8c7b0a94 100644 --- a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json index 71b13ee5a9..bdcb6598d1 100644 --- a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json index 578594fb6d..68259c1b9c 100644 --- a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json index b1c6d75669..67474508ec 100644 --- a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json index 9f8edea286..506000aae9 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json index 339ec67ee7..8a5e838668 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json index 355f2f58db..37575396e3 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/X3DReader/plugin.json b/plugins/X3DReader/plugin.json index 1fc14104ed..17bb3a96d1 100644 --- a/plugins/X3DReader/plugin.json +++ b/plugins/X3DReader/plugin.json @@ -3,6 +3,6 @@ "author": "Seva Alekseyev", "version": "1.0.1", "description": "Provides support for reading X3D files.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/XRayView/plugin.json b/plugins/XRayView/plugin.json index 71cc165b6c..ff220ed97c 100644 --- a/plugins/XRayView/plugin.json +++ b/plugins/XRayView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the X-Ray view.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/plugins/XmlMaterialProfile/plugin.json b/plugins/XmlMaterialProfile/plugin.json index bb1db82fa4..a8f82d1058 100644 --- a/plugins/XmlMaterialProfile/plugin.json +++ b/plugins/XmlMaterialProfile/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides capabilities to read and write XML-based material profiles.", - "api": "6.0", + "api": "7.0", "i18n-catalog": "cura" } diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 0c74276912..22642cd38e 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -6,7 +6,7 @@ "display_name": "3MF Reader", "description": "Provides support for reading 3MF files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -23,7 +23,7 @@ "display_name": "3MF Writer", "description": "Provides support for writing 3MF files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -40,7 +40,7 @@ "display_name": "AMF Reader", "description": "Provides support for reading AMF files.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -57,7 +57,7 @@ "display_name": "Cura Backups", "description": "Backup and restore your configuration.", "package_version": "1.2.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -74,7 +74,7 @@ "display_name": "CuraEngine Backend", "description": "Provides the link to the CuraEngine slicing backend.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -91,7 +91,7 @@ "display_name": "Cura Profile Reader", "description": "Provides support for importing Cura profiles.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -108,7 +108,7 @@ "display_name": "Cura Profile Writer", "description": "Provides support for exporting Cura profiles.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -125,7 +125,7 @@ "display_name": "Firmware Update Checker", "description": "Checks for firmware updates.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -142,7 +142,7 @@ "display_name": "Firmware Updater", "description": "Provides a machine actions for updating firmware.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -159,7 +159,7 @@ "display_name": "Compressed G-code Reader", "description": "Reads g-code from a compressed archive.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -176,7 +176,7 @@ "display_name": "Compressed G-code Writer", "description": "Writes g-code to a compressed archive.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -193,7 +193,7 @@ "display_name": "G-Code Profile Reader", "description": "Provides support for importing profiles from g-code files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -210,7 +210,7 @@ "display_name": "G-Code Reader", "description": "Allows loading and displaying G-code files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "VictorLarchenko", @@ -227,7 +227,7 @@ "display_name": "G-Code Writer", "description": "Writes g-code to a file.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -244,7 +244,7 @@ "display_name": "Image Reader", "description": "Enables ability to generate printable geometry from 2D image files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -261,7 +261,7 @@ "display_name": "Legacy Cura Profile Reader", "description": "Provides support for importing profiles from legacy Cura versions.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -278,7 +278,7 @@ "display_name": "Machine Settings Action", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -295,7 +295,7 @@ "display_name": "Model Checker", "description": "Checks models and print configuration for possible printing issues and give suggestions.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -312,7 +312,7 @@ "display_name": "Monitor Stage", "description": "Provides a monitor stage in Cura.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -329,7 +329,7 @@ "display_name": "Per-Object Settings Tool", "description": "Provides the per-model settings.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -346,7 +346,7 @@ "display_name": "Post Processing", "description": "Extension that allows for user created scripts for post processing.", "package_version": "2.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -363,7 +363,7 @@ "display_name": "Prepare Stage", "description": "Provides a prepare stage in Cura.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -380,7 +380,7 @@ "display_name": "Preview Stage", "description": "Provides a preview stage in Cura.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -397,7 +397,7 @@ "display_name": "Removable Drive Output Device", "description": "Provides removable drive hotplugging and writing support.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -414,7 +414,7 @@ "display_name": "Simulation View", "description": "Provides the Simulation view.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -431,7 +431,7 @@ "display_name": "Slice Info", "description": "Submits anonymous slice info. Can be disabled through preferences.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -448,7 +448,7 @@ "display_name": "Solid View", "description": "Provides a normal solid mesh view.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -465,7 +465,7 @@ "display_name": "Support Eraser Tool", "description": "Creates an eraser mesh to block the printing of support in certain places.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -482,7 +482,7 @@ "display_name": "Trimesh Reader", "description": "Provides support for reading model files.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -499,7 +499,7 @@ "display_name": "Toolbox", "description": "Find, manage and install new Cura packages.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -516,7 +516,7 @@ "display_name": "UFP Reader", "description": "Provides support for reading Ultimaker Format Packages.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -533,7 +533,7 @@ "display_name": "UFP Writer", "description": "Provides support for writing Ultimaker Format Packages.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -550,7 +550,7 @@ "display_name": "Ultimaker Machine Actions", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -567,7 +567,7 @@ "display_name": "UM3 Network Printing", "description": "Manages network connections to Ultimaker 3 printers.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -584,7 +584,7 @@ "display_name": "USB Printing", "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "package_version": "1.0.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -601,7 +601,7 @@ "display_name": "Version Upgrade 2.1 to 2.2", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -618,7 +618,7 @@ "display_name": "Version Upgrade 2.2 to 2.4", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -635,7 +635,7 @@ "display_name": "Version Upgrade 2.5 to 2.6", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -652,7 +652,7 @@ "display_name": "Version Upgrade 2.6 to 2.7", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -669,7 +669,7 @@ "display_name": "Version Upgrade 2.7 to 3.0", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -686,7 +686,7 @@ "display_name": "Version Upgrade 3.0 to 3.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -703,7 +703,7 @@ "display_name": "Version Upgrade 3.2 to 3.3", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -720,7 +720,7 @@ "display_name": "Version Upgrade 3.3 to 3.4", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -737,7 +737,7 @@ "display_name": "Version Upgrade 3.4 to 3.5", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -754,7 +754,7 @@ "display_name": "Version Upgrade 3.5 to 4.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -771,7 +771,7 @@ "display_name": "Version Upgrade 4.0 to 4.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -788,7 +788,7 @@ "display_name": "Version Upgrade 4.1 to 4.2", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -805,7 +805,7 @@ "display_name": "Version Upgrade 4.2 to 4.3", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -822,7 +822,7 @@ "display_name": "Version Upgrade 4.3 to 4.4", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", "package_version": "1.0.0", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -839,7 +839,7 @@ "display_name": "X3D Reader", "description": "Provides support for reading X3D files.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "SevaAlekseyev", @@ -856,7 +856,7 @@ "display_name": "XML Material Profiles", "description": "Provides capabilities to read and write XML-based material profiles.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -873,7 +873,7 @@ "display_name": "X-Ray View", "description": "Provides the X-Ray view.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -890,7 +890,7 @@ "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -908,7 +908,7 @@ "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -926,7 +926,7 @@ "display_name": "Generic CFF CPE", "description": "The generic CFF CPE profile which other profiles can be based upon.", "package_version": "1.1.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -944,7 +944,7 @@ "display_name": "Generic CFF PA", "description": "The generic CFF PA profile which other profiles can be based upon.", "package_version": "1.1.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -962,7 +962,7 @@ "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -980,7 +980,7 @@ "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -998,7 +998,7 @@ "display_name": "Generic GFF CPE", "description": "The generic GFF CPE profile which other profiles can be based upon.", "package_version": "1.1.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1016,7 +1016,7 @@ "display_name": "Generic GFF PA", "description": "The generic GFF PA profile which other profiles can be based upon.", "package_version": "1.1.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1034,7 +1034,7 @@ "display_name": "Generic HIPS", "description": "The generic HIPS profile which other profiles can be based upon.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1052,7 +1052,7 @@ "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1070,7 +1070,7 @@ "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1088,7 +1088,7 @@ "display_name": "Generic PETG", "description": "The generic PETG profile which other profiles can be based upon.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1106,7 +1106,7 @@ "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1124,7 +1124,7 @@ "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1142,7 +1142,7 @@ "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1160,7 +1160,7 @@ "display_name": "Generic Tough PLA", "description": "The generic Tough PLA profile which other profiles can be based upon.", "package_version": "1.0.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1178,7 +1178,7 @@ "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1196,7 +1196,7 @@ "display_name": "Dagoma Chromatik PLA", "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://dagoma.fr/boutique/filaments.html", "author": { "author_id": "Dagoma", @@ -1213,7 +1213,7 @@ "display_name": "FABtotum ABS", "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40", "author": { "author_id": "FABtotum", @@ -1230,7 +1230,7 @@ "display_name": "FABtotum Nylon", "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53", "author": { "author_id": "FABtotum", @@ -1247,7 +1247,7 @@ "display_name": "FABtotum PLA", "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39", "author": { "author_id": "FABtotum", @@ -1264,7 +1264,7 @@ "display_name": "FABtotum TPU Shore 98A", "description": "", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66", "author": { "author_id": "FABtotum", @@ -1281,7 +1281,7 @@ "display_name": "Fiberlogy HD PLA", "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", @@ -1298,7 +1298,7 @@ "display_name": "Filo3D PLA", "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://dagoma.fr", "author": { "author_id": "Dagoma", @@ -1315,7 +1315,7 @@ "display_name": "IMADE3D JellyBOX PETG", "description": "", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1332,7 +1332,7 @@ "display_name": "IMADE3D JellyBOX PLA", "description": "", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1349,7 +1349,7 @@ "display_name": "Octofiber PLA", "description": "PLA material from Octofiber.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://nl.octofiber.com/3d-printing-filament/pla.html", "author": { "author_id": "Octofiber", @@ -1366,7 +1366,7 @@ "display_name": "PolyFlex™ PLA", "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://www.polymaker.com/shop/polyflex/", "author": { "author_id": "Polymaker", @@ -1383,7 +1383,7 @@ "display_name": "PolyMax™ PLA", "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://www.polymaker.com/shop/polymax/", "author": { "author_id": "Polymaker", @@ -1400,7 +1400,7 @@ "display_name": "PolyPlus™ PLA True Colour", "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://www.polymaker.com/shop/polyplus-true-colour/", "author": { "author_id": "Polymaker", @@ -1417,7 +1417,7 @@ "display_name": "PolyWood™ PLA", "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "http://www.polymaker.com/shop/polywood/", "author": { "author_id": "Polymaker", @@ -1434,7 +1434,7 @@ "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1453,7 +1453,7 @@ "display_name": "Ultimaker Breakaway", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/breakaway", "author": { "author_id": "UltimakerPackages", @@ -1472,7 +1472,7 @@ "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1491,7 +1491,7 @@ "display_name": "Ultimaker CPE+", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/cpe", "author": { "author_id": "UltimakerPackages", @@ -1510,7 +1510,7 @@ "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1529,7 +1529,7 @@ "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/pc", "author": { "author_id": "UltimakerPackages", @@ -1548,7 +1548,7 @@ "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1567,7 +1567,7 @@ "display_name": "Ultimaker PP", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/pp", "author": { "author_id": "UltimakerPackages", @@ -1586,7 +1586,7 @@ "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1605,7 +1605,7 @@ "display_name": "Ultimaker TPU 95A", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.2.2", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { "author_id": "UltimakerPackages", @@ -1624,7 +1624,7 @@ "display_name": "Ultimaker Tough PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.0.3", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://ultimaker.com/products/materials/tough-pla", "author": { "author_id": "UltimakerPackages", @@ -1643,7 +1643,7 @@ "display_name": "Vertex Delta ABS", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1660,7 +1660,7 @@ "display_name": "Vertex Delta PET", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1677,7 +1677,7 @@ "display_name": "Vertex Delta PLA", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1694,7 +1694,7 @@ "display_name": "Vertex Delta TPU", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.0.1", - "sdk_version": "6.0.0", + "sdk_version": "7.0.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", From e619b076f0c2254fd2a1230afd5a110cdaa4b2b1 Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Mon, 21 Oct 2019 16:59:30 +0200 Subject: [PATCH 701/994] add skriware_2.def.json --- resources/definitions/skriware_2.def.json | 633 ++++++++++++++++++++++ 1 file changed, 633 insertions(+) create mode 100644 resources/definitions/skriware_2.def.json diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json new file mode 100644 index 0000000000..2149a8e429 --- /dev/null +++ b/resources/definitions/skriware_2.def.json @@ -0,0 +1,633 @@ +{ + "name": "Skriware 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Skriware", + "manufacturer": "Skriware", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0], + "supports_usb_connection": false, + "platform": "skriware_2_platform.stl", + "machine_extruder_trains": + { + "0": "skriware_2_extruder_0", + "1": "skriware_2_extruder_1" + } + }, + + "overrides": { + "jerk_print_layer_0": { + "default_value": 5 + }, + "jerk_prime_tower": { + "default_value": 5 + }, + "expand_skins_expand_distance": { + "default_value": 1.2 + }, + "jerk_support_interface": { + "default_value": 5 + }, + "jerk_travel_layer_0": { + "default_value": 5.0 + }, + "wipe_retraction_prime_speed": { + "default_value": 30 + }, + "material_standby_temperature": { + "default_value": 195 + }, + "acceleration_support_bottom": { + "default_value": 250 + }, + "raft_base_line_width": { + "default_value": 0.5 + }, + "raft_speed": { + "default_value": 30.0 + }, + "jerk_topbottom": { + "default_value": 5 + }, + "ironing_inset": { + "default_value": 0.2 + }, + "acceleration_wall": { + "default_value": 250 + }, + "cross_infill_pocket_size": { + "default_value": 5.333333333333333 + }, + "jerk_support_roof": { + "default_value": 5 + }, + "acceleration_print": { + "default_value": 250 + }, + "meshfix_maximum_travel_resolution": { + "default_value": 0.8 + }, + "support_top_distance": { + "default_value": 0.22 + }, + "acceleration_enabled": { + "default_value": true + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "jerk_layer_0": { + "default_value": 5 + }, + "infill_line_distance": { + "default_value": 5.333333333333333 + }, + "acceleration_ironing": { + "default_value": 250 + }, + "material_print_temperature_layer_0": { + "default_value": 195 + }, + "machine_extruder_start_pos_x": { + "default_value": 0 + }, + "bridge_skin_speed_2": { + "default_value": 15 + }, + "acceleration_travel": { + "default_value": 250 + }, + "switch_extruder_retraction_speed": { + "default_value": 30 + }, + "machine_extruder_cooling_fan_number": { + "default_value": 0 + }, + "jerk_print": { + "default_value": 5 + }, + "material_guid": { + "default_value": "0ff92885-617b-4144-a03c-9989872454bc" + }, + "raft_interface_acceleration": { + "default_value": 250 + }, + "acceleration_support_interface": { + "default_value": 250 + }, + "cool_fan_full_layer": { + "default_value": 1 + }, + "skirt_brim_minimal_length": { + "default_value": 50 + }, + "material_bed_temperature": { + "default_value": 50 + }, + "speed_slowdown_layers": { + "default_value": 1 + }, + "speed_travel": { + "default_value": 150 + }, + "skin_overlap": { + "default_value": 15 + }, + "acceleration_infill": { + "default_value": 250 + }, + "support_roof_material_flow": { + "default_value": 99 + }, + "raft_base_jerk": { + "default_value": 5 + }, + "retraction_retract_speed": { + "default_value": 30 + }, + "infill_wipe_dist": { + "default_value": 0.1 + }, + "jerk_wall_x": { + "default_value": 5 + }, + "layer_height": { + "default_value": 0.2 + }, + "bottom_skin_expand_distance": { + "default_value": 1.2000000000000002 + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" + }, + "travel_retract_before_outer_wall": { + "default_value": true + }, + "xy_offset_layer_0": { + "default_value": -0.16 + }, + "adhesion_type": { + "default_value": "raft" + }, + "min_skin_width_for_expansion": { + "default_value": 0.671279704941824 + }, + "support_bottom_material_flow": { + "default_value": 99 + }, + "prime_tower_position_x": { + "default_value": 1 + }, + "machine_depth": { + "default_value": 260 + }, + "machine_extruder_start_pos_y": { + "default_value": 0 + }, + "retraction_speed": { + "default_value": 30 + }, + "support_skip_some_zags": { + "default_value": true + }, + "remove_empty_first_layers": { + "default_value": false + }, + "z_seam_x": { + "default_value": 115 + }, + "support_xy_distance_overhang": { + "default_value": 0.5 + }, + "support_tree_wall_thickness": { + "default_value": 0.4 + }, + "acceleration_print_layer_0": { + "default_value": 250 + }, + "support_xy_distance": { + "default_value": 0.8 + }, + "support_roof_line_distance": { + "default_value": 0.5714285714285714 + }, + "jerk_enabled": { + "default_value": true + }, + "min_infill_area": { + "default_value": 1 + }, + "travel_avoid_supports": { + "default_value": true + }, + "bottom_layers": { + "default_value": 3 + }, + "multiple_mesh_overlap": { + "default_value": 0 + }, + "retraction_hop_enabled": { + "default_value": true + }, + "acceleration_topbottom": { + "default_value": 250 + }, + "jerk_wall": { + "default_value": 5 + }, + "jerk_wall_0": { + "default_value": 5 + }, + "skin_overlap_mm": { + "default_value": 0.06 + }, + "retraction_min_travel": { + "default_value": 1 + }, + "support_interface_material_flow": { + "default_value": 99 + }, + "material_diameter": { + "default_value": 1.75 + }, + "speed_roofing": { + "default_value": 30.0 + }, + "skin_outline_count": { + "default_value": 0 + }, + "skin_no_small_gaps_heuristic": { + "default_value": true + }, + "top_bottom_pattern_0": { + "default_value": "zigzag" + }, + "top_skin_expand_distance": { + "default_value": 1.2000000000000002 + }, + "acceleration_travel_layer_0": { + "default_value": 250.0 + }, + "prime_tower_min_volume": { + "default_value": 4 + }, + "switch_extruder_retraction_speeds": { + "default_value": 30 + }, + "skin_preshrink": { + "default_value": 1.2000000000000002 + }, + "material_bed_temperature_layer_0": { + "default_value": 50 + }, + "support_tree_collision_resolution": { + "default_value": 0.2 + }, + "machine_height": { + "default_value": 210 + }, + "raft_acceleration": { + "default_value": 250 + }, + "fill_outline_gaps": { + "default_value": true + }, + "wall_x_material_flow": { + "default_value": 99 + }, + "jerk_support_bottom": { + "default_value": 5 + }, + "machine_end_gcode": { + "default_value": "M59\nG92 E1\nG1 E-1 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" + }, + "infill_sparse_density": { + "default_value": 15 + }, + "meshfix_maximum_deviation": { + "default_value": 0.005 + }, + "wall_0_material_flow": { + "default_value": 99 + }, + "material_adhesion_tendency": { + "default_value": 0 + }, + "prime_tower_flow": { + "default_value": 99 + }, + "prime_tower_position_y": { + "default_value": 1 + }, + "support_material_flow": { + "default_value": 99 + }, + "machine_extruder_start_code": { + "default_value": "" + }, + "retract_at_layer_change": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 2 + }, + "wall_thickness": { + "default_value": 1.2 + }, + "support_infill_sparse_thickness": { + "default_value": 0.2 + }, + "raft_surface_acceleration": { + "default_value": 250 + }, + "machine_nozzle_offset_y": { + "default_value": 0 + }, + "roofing_layer_count": { + "default_value": 1 + }, + "skirt_brim_line_width": { + "default_value": 0.5 + }, + "jerk_support": { + "default_value": 5 + }, + "raft_surface_jerk": { + "default_value": 5 + }, + "speed_equalize_flow_max": { + "default_value": 40 + }, + "raft_surface_speed": { + "default_value": 30.0 + }, + "jerk_travel": { + "default_value": 5 + }, + "support_zag_skip_count": { + "default_value": 8 + }, + "retraction_combing": { + "default_value": "infill" + }, + "raft_interface_line_spacing": { + "default_value": 0.4 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "extruders_enabled_count": { + "default_value": 2 + }, + "support_line_distance": { + "default_value": 1.3333333333333333 + }, + "support_roof_density": { + "default_value": 70 + }, + "raft_base_line_spacing": { + "default_value": 0.8 + }, + "machine_extruder_end_pos_y": { + "default_value": 0 + }, + "acceleration_prime_tower": { + "default_value": 250 + }, + "skin_material_flow": { + "default_value": 99 + }, + "support_z_distance": { + "default_value": 0.22 + }, + "bottom_skin_preshrink": { + "default_value": 1.2000000000000002 + }, + "jerk_skirt_brim": { + "default_value": 5 + }, + "z_seam_y": { + "default_value": 180 + }, + "skirt_line_count": { + "default_value": 2 + }, + "raft_margin": { + "default_value": 4 + }, + "infill_material_flow": { + "default_value": 99 + }, + "wipe_retraction_retract_speed": { + "default_value": 30 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_weighted" + }, + "support_roof_height": { + "default_value": 0.4 + }, + "top_layers": { + "default_value": 4 + }, + "support_infill_rate": { + "default_value": 30 + }, + "raft_interface_speed": { + "default_value": 35 + }, + "default_material_print_temperature": { + "default_value": 195 + }, + "acceleration_layer_0": { + "default_value": 250 + }, + "support_skip_zag_per_mm": { + "default_value": 10 + }, + "material_initial_print_temperature": { + "default_value": 195 + }, + "raft_interface_jerk": { + "default_value": 5 + }, + "machine_width": { + "default_value": 210 + }, + "wall_line_count": { + "default_value": 3 + }, + "retraction_amount": { + "default_value": 3 + }, + "infill_sparse_thickness": { + "default_value": 0.2 + }, + "support_initial_layer_line_distance": { + "default_value": 1.3333333333333333 + }, + "jerk_support_infill": { + "default_value": 5 + }, + "acceleration_roofing": { + "default_value": 250 + }, + "retraction_extrusion_window": { + "default_value": 3 + }, + "raft_interface_line_width": { + "default_value": 0.4 + }, + "acceleration_support_roof": { + "default_value": 250 + }, + "support_brim_line_count": { + "default_value": 16 + }, + "layer_0_z_overlap": { + "default_value": 0.1 + }, + "support_angle": { + "default_value": 60 + }, + "machine_heated_bed": { + "default_value": true + }, + "raft_surface_thickness": { + "default_value": 0.2 + }, + "cool_min_layer_time": { + "default_value": 10 + }, + "gantry_height": { + "default_value": 210 + }, + "raft_airgap": { + "default_value": 0.2 + }, + "machine_extruder_end_pos_x": { + "default_value": 0 + }, + "acceleration_skirt_brim": { + "default_value": 250 + }, + "skirt_brim_material_flow": { + "default_value": 99 + }, + "jerk_infill": { + "default_value": 5 + }, + "roofing_material_flow": { + "default_value": 99 + }, + "extruder_nr": { + "default_value": 0 + }, + "support_use_towers": { + "default_value": false + }, + "ooze_shield_angle": { + "default_value": 50 + }, + "material_flow": { + "default_value": 99 + }, + "machine_extruder_end_code": { + "default_value": "" + }, + "speed_travel_layer_0": { + "default_value": 75.0 + }, + "raft_base_acceleration": { + "default_value": 250 + }, + "retraction_count_max": { + "default_value": 40 + }, + "ooze_shield_dist": { + "default_value": 4 + }, + "acceleration_support": { + "default_value": 250 + }, + "max_skin_angle_for_expansion": { + "default_value": 50 + }, + "coasting_enable": { + "default_value": true + }, + "brim_width": { + "default_value": 10 + }, + "acceleration_support_infill": { + "default_value": 250 + }, + "machine_extruder_start_pos_abs": { + "default_value": false + }, + "retraction_prime_speed": { + "default_value": 30 + }, + "raft_base_speed": { + "default_value": 35 + }, + "acceleration_wall_0": { + "default_value": 250 + }, + "xy_offset": { + "default_value": -0.16 + }, + "machine_nozzle_offset_x": { + "default_value": 0 + }, + "prime_tower_size": { + "default_value": 1 + }, + "jerk_ironing": { + "default_value": 5 + }, + "switch_extruder_prime_speed": { + "default_value": 30 + }, + "raft_jerk": { + "default_value": 5 + }, + "top_skin_preshrink": { + "default_value": 1.2000000000000002 + }, + "material_print_temperature": { + "default_value": 195 + }, + "wall_material_flow": { + "default_value": 99 + }, + "jerk_roofing": { + "default_value": 5 + }, + "cool_fan_full_at_height": { + "default_value": 0 + }, + "acceleration_wall_x": { + "default_value": 250 + }, + "support_bottom_distance": { + "default_value": 0.23 + }, + "cool_min_speed": { + "default_value": 15 + }, + "default_material_bed_temperature": { + "default_value": 50 + }, + "raft_interface_thickness": { + "default_value": 0.2 + }, + "machine_extruder_end_pos_abs": { + "default_value": false + } + } +} \ No newline at end of file From 4f13847b058ce24ba83f2f90336fd738952adefb Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Mon, 21 Oct 2019 17:00:43 +0200 Subject: [PATCH 702/994] add extruders definitions --- .../extruders/skriware_2_extruder_0.def.json | 19 +++++++++++++++++++ .../extruders/skriware_2_extruder_1.def.json | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 resources/extruders/skriware_2_extruder_0.def.json create mode 100644 resources/extruders/skriware_2_extruder_1.def.json diff --git a/resources/extruders/skriware_2_extruder_0.def.json b/resources/extruders/skriware_2_extruder_0.def.json new file mode 100644 index 0000000000..c2909aa9df --- /dev/null +++ b/resources/extruders/skriware_2_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "id": "skriware_2_extruder_0", + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "skriware_2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/skriware_2_extruder_1.def.json b/resources/extruders/skriware_2_extruder_1.def.json new file mode 100644 index 0000000000..2fedd3dcff --- /dev/null +++ b/resources/extruders/skriware_2_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "id": "skriware_2_extruder_1", + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "skriware_2", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 30e7e1f3340338494a26d45f1a13f0979bf53adf Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Mon, 21 Oct 2019 17:01:33 +0200 Subject: [PATCH 703/994] add mesh file --- resources/meshes/skriware_2_platform.stl | Bin 0 -> 659284 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/meshes/skriware_2_platform.stl diff --git a/resources/meshes/skriware_2_platform.stl b/resources/meshes/skriware_2_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..b85b33ad94aff5353806853546a77d3b88230be3 GIT binary patch literal 659284 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

;= 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 x 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 z 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 Date: Tue, 22 Oct 2019 08:09:28 +0200 Subject: [PATCH 704/994] Update setting_version for key3d tyro qualities CURA-6815 --- resources/quality/key3d/key3d_tyro_best.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_fast.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_normal.inst.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index e5a257f898..0b9289b042 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = key3d_tyro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = best weight = 1 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 4ca4a65950..7ab9776b4e 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = key3d_tyro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 7f650612ff..7ed3791edc 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = key3d_tyro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = normal weight = 0 From 51c3acc6542ed3b74d1623db3da2a2d4da6aa8b8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 09:56:27 +0200 Subject: [PATCH 705/994] Document helper functions --- tests/Settings/TestDefinitionContainer.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 09efc3fcb8..73d10d871c 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -72,6 +72,11 @@ def test_validateOverridingDefaultValue(file_name): if "value" in parent_settings[key]: assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective. +## Get all settings and their properties from a definition we're inheriting +# from. +# \param definition_id The definition we're inheriting from. +# \return A dictionary of settings by key. Each setting is a dictionary of +# properties. def getInheritedSettings(definition_id: str) -> Dict[str, Any]: definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", definition_id + ".def.json") with open(definition_path, encoding = "utf-8") as f: @@ -87,7 +92,13 @@ def getInheritedSettings(definition_id: str) -> Dict[str, Any]: return result -def flattenSettings(settings) -> Dict[str, Any]: +## Put all settings in the main dictionary rather than in children dicts. +# \param settings Nested settings. The keys are the setting IDs. The values +# are dictionaries of properties per setting, including the "children" +# property. +# \return A dictionary of settings by key. Each setting is a dictionary of +# properties. +def flattenSettings(settings: Dict[str, Any]) -> Dict[str, Any]: result = {} for entry, contents in settings.items(): if "children" in contents: @@ -96,6 +107,11 @@ def flattenSettings(settings) -> Dict[str, Any]: result[entry] = contents return result +## Make one dictionary override the other. Nested dictionaries override each +# other in the same way. +# \param base A dictionary of settings that will get overridden by the other. +# \param overrides A dictionary of settings that will override the other. +# \return Combined setting data. def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, Any]: result = {} result.update(base) From d561810024cd060fbc15af0a952de3dbc87c7d76 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 11:00:49 +0200 Subject: [PATCH 706/994] Remove ID metadata fields from definition files They are not being used any more. For some reason people thought that an exception was made for extruders or something. And people keep adding them for the definition files too. I'll add a test to prevent that. --- resources/definitions/bibo2_dual.def.json | 1 - resources/definitions/creality_cr-x.def.json | 1 - resources/definitions/cubicon_3dp_110f.def.json | 1 - resources/definitions/cubicon_3dp_210f.def.json | 1 - resources/definitions/cubicon_3dp_310f.def.json | 1 - resources/definitions/flsun_qq_s.def.json | 1 - resources/definitions/geeetech_a30.def.json | 1 - resources/definitions/gmax15plus.def.json | 1 - resources/definitions/gmax15plus_dual.def.json | 1 - resources/definitions/malyan_m180.def.json | 1 - resources/definitions/malyan_m200.def.json | 1 - resources/definitions/monoprice_select_mini_v1.def.json | 1 - resources/definitions/monoprice_select_mini_v2.def.json | 1 - resources/definitions/ubuild-3d_mr_bot_280.def.json | 1 - resources/definitions/ultimaker_s3.def.json | 1 - resources/definitions/ultimaker_s5.def.json | 1 - resources/definitions/uni_print_3d.def.json | 1 - resources/extruders/101Hero_extruder_0.def.json | 1 - resources/extruders/3dator_extruder_0.def.json | 1 - resources/extruders/Mark2_extruder1.def.json | 1 - resources/extruders/Mark2_extruder2.def.json | 1 - resources/extruders/abax_pri3_extruder_0.def.json | 1 - resources/extruders/abax_pri5_extruder_0.def.json | 1 - resources/extruders/abax_titan_extruder_0.def.json | 1 - resources/extruders/alfawise_u20_extruder_0.def.json | 1 - resources/extruders/alfawise_u30_extruder_0.def.json | 1 - resources/extruders/alya3dp_extruder_0.def.json | 1 - resources/extruders/anet_a6_extruder_0.def.json | 1 - resources/extruders/anycubic_4max_extruder_0.def.json | 1 - resources/extruders/anycubic_chiron_extruder_0.def.json | 1 - resources/extruders/anycubic_i3_mega_extruder_0.def.json | 1 - resources/extruders/bfb_extruder_0.def.json | 1 - resources/extruders/bibo2_dual_extruder_0.def.json | 1 - resources/extruders/bibo2_dual_extruder_1.def.json | 1 - resources/extruders/bq_hephestos_2_extruder_0.def.json | 1 - resources/extruders/bq_hephestos_extruder_0.def.json | 1 - resources/extruders/bq_hephestos_xl_extruder_0.def.json | 1 - resources/extruders/bq_witbox_2_extruder_0.def.json | 1 - resources/extruders/bq_witbox_extruder_0.def.json | 1 - resources/extruders/builder_premium_large_front.def.json | 1 - resources/extruders/builder_premium_large_rear.def.json | 1 - resources/extruders/builder_premium_medium_front.def.json | 1 - resources/extruders/builder_premium_medium_rear.def.json | 1 - resources/extruders/builder_premium_small_front.def.json | 1 - resources/extruders/builder_premium_small_rear.def.json | 1 - resources/extruders/cartesio_extruder_0.def.json | 1 - resources/extruders/cartesio_extruder_1.def.json | 1 - resources/extruders/cartesio_extruder_2.def.json | 1 - resources/extruders/cartesio_extruder_3.def.json | 1 - resources/extruders/cocoon_create_modelmaker_extruder_0.def.json | 1 - resources/extruders/cr-x_extruder_0.def.json | 1 - resources/extruders/cr-x_extruder_1.def.json | 1 - resources/extruders/creatable_d3_extruder_0.def.json | 1 - resources/extruders/cubicon_3dp_110f_extruder_0.def.json | 1 - resources/extruders/cubicon_3dp_210f_extruder_0.def.json | 1 - resources/extruders/cubicon_3dp_310f_extruder_0.def.json | 1 - resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json | 1 - resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json | 1 - resources/extruders/cubicon_style_plus_a15_extruder_0.def.json | 1 - resources/extruders/custom_extruder_1.def.json | 1 - resources/extruders/custom_extruder_2.def.json | 1 - resources/extruders/custom_extruder_3.def.json | 1 - resources/extruders/custom_extruder_4.def.json | 1 - resources/extruders/custom_extruder_5.def.json | 1 - resources/extruders/custom_extruder_6.def.json | 1 - resources/extruders/custom_extruder_7.def.json | 1 - resources/extruders/custom_extruder_8.def.json | 1 - resources/extruders/delta_go_extruder_0.def.json | 1 - resources/extruders/deltabot_extruder_0.def.json | 1 - resources/extruders/deltacomb_extruder_0.def.json | 1 - resources/extruders/deltacomb_extruder_1.def.json | 1 - resources/extruders/easyarts_ares_extruder_0.def.json | 1 - resources/extruders/erzay3d_extruder_0.def.json | 1 - resources/extruders/fabtotum_extruder_0.def.json | 1 - resources/extruders/felixpro2_dual_extruder_0.def.json | 1 - resources/extruders/felixpro2_dual_extruder_1.def.json | 1 - resources/extruders/felixtec4_dual_extruder_0.def.json | 1 - resources/extruders/felixtec4_dual_extruder_1.def.json | 1 - resources/extruders/flsun_qq_extruder.def.json | 1 - resources/extruders/flsun_qq_s_extruder_0.def.json | 1 - resources/extruders/folgertech_FT-5_extruder_0.def.json | 1 - resources/extruders/geeetech_a30_extruder_0.def.json | 1 - resources/extruders/gmax15plus_dual_extruder_0.def.json | 1 - resources/extruders/gmax15plus_dual_extruder_1.def.json | 1 - resources/extruders/gmax15plus_extruder_0.def.json | 1 - resources/extruders/grr_neo_extruder_0.def.json | 1 - resources/extruders/hBp_extruder_left.def.json | 1 - resources/extruders/hBp_extruder_right.def.json | 1 - resources/extruders/hms434_tool_1.def.json | 1 - resources/extruders/hms434_tool_2.def.json | 1 - resources/extruders/hms434_tool_3.def.json | 1 - resources/extruders/hms434_tool_4.def.json | 1 - resources/extruders/hms434_tool_5.def.json | 1 - resources/extruders/hms434_tool_6.def.json | 1 - resources/extruders/hms434_tool_7.def.json | 1 - resources/extruders/hms434_tool_8.def.json | 1 - resources/extruders/imade3d_jellybox_2_extruder_0.def.json | 1 - resources/extruders/imade3d_jellybox_extruder_0.def.json | 1 - resources/extruders/innovo_inventor_extruder_0.def.json | 1 - resources/extruders/jgaurora_a1_extruder_0.def.json | 1 - resources/extruders/jgaurora_a3s_extruder_0.def.json | 1 - resources/extruders/jgaurora_a5_extruder_0.def.json | 1 - resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json | 1 - resources/extruders/jgaurora_z_603s_extruder_0.def.json | 1 - resources/extruders/julia_extruder_0.def.json | 1 - resources/extruders/kemiq_q2_beta_extruder_0.def.json | 1 - resources/extruders/kemiq_q2_gama_extruder_0.def.json | 1 - resources/extruders/key3d_tyro_extruder_0.def.json | 1 - resources/extruders/kossel_mini_extruder_0.def.json | 1 - resources/extruders/kossel_pro_extruder_0.def.json | 1 - resources/extruders/kupido_extruder_0.def.json | 1 - resources/extruders/makeR_pegasus_extruder_0.def.json | 1 - resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json | 1 - resources/extruders/makeit_dual_1st.def.json | 1 - resources/extruders/makeit_dual_2nd.def.json | 1 - resources/extruders/makeit_l_dual_1st.def.json | 1 - resources/extruders/makeit_l_dual_2nd.def.json | 1 - resources/extruders/maker_starter_extruder_0.def.json | 1 - resources/extruders/makerbotreplicator_extruder_0.def.json | 1 - resources/extruders/malyan_m180_extruder_0.def.json | 1 - resources/extruders/malyan_m200_extruder_0.def.json | 1 - .../extruders/mankati_fullscale_xt_plus_extruder_0.def.json | 1 - resources/extruders/mendel90_extruder_0.def.json | 1 - resources/extruders/monoprice_select_mini_v1_extruder_0.def.json | 1 - resources/extruders/monoprice_select_mini_v2_extruder_0.def.json | 1 - resources/extruders/nwa3d_a31_extruder_0.def.json | 1 - resources/extruders/nwa3d_a5_extruder_0.def.json | 1 - resources/extruders/ord_extruder_0.def.json | 1 - resources/extruders/ord_extruder_1.def.json | 1 - resources/extruders/ord_extruder_2.def.json | 1 - resources/extruders/ord_extruder_3.def.json | 1 - resources/extruders/ord_extruder_4.def.json | 1 - resources/extruders/peopoly_moai_extruder_0.def.json | 1 - resources/extruders/printrbot_play_extruder_0.def.json | 1 - resources/extruders/printrbot_play_heated_extruder_0.def.json | 1 - .../extruders/printrbot_simple_extended_extruder_0.def.json | 1 - resources/extruders/printrbot_simple_extruder_0.def.json | 1 - .../extruders/printrbot_simple_makers_kit_extruder_0.def.json | 1 - resources/extruders/prusa_i3_extruder_0.def.json | 1 - resources/extruders/prusa_i3_mk2_extruder_0.def.json | 1 - resources/extruders/prusa_i3_xl_extruder_0.def.json | 1 - resources/extruders/punchtec_connect_xl_extruder_0.def.json | 1 - resources/extruders/punchtec_connect_xl_extruder_1.def.json | 1 - resources/extruders/raise3D_N2_dual_extruder_0.def.json | 1 - resources/extruders/raise3D_N2_dual_extruder_1.def.json | 1 - resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json | 1 - resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json | 1 - resources/extruders/raise3D_N2_single_extruder_0.def.json | 1 - resources/extruders/renkforce_rf100_extruder_0.def.json | 1 - resources/extruders/rigid3d_3rdgen_extruder_0.def.json | 1 - resources/extruders/rigid3d_extruder_0.def.json | 1 - resources/extruders/rigid3d_hobby_extruder_0.def.json | 1 - resources/extruders/rigid3d_mucit_extruder_0.def.json | 1 - resources/extruders/rigid3d_zero2_extruder_0.def.json | 1 - resources/extruders/rigid3d_zero_extruder_0.def.json | 1 - resources/extruders/rigidbot_big_extruder_0.def.json | 1 - resources/extruders/rigidbot_extruder_0.def.json | 1 - resources/extruders/robo_3d_r1_extruder_0.def.json | 1 - resources/extruders/seemecnc_artemis_extruder_0.def.json | 1 - resources/extruders/seemecnc_v32_extruder_0.def.json | 1 - resources/extruders/stereotech_start_extruder_0.def.json | 1 - resources/extruders/stereotech_ste320_1st.def.json | 1 - resources/extruders/stereotech_ste320_2nd.def.json | 1 - resources/extruders/strateo3d_left_extruder.def.json | 1 - resources/extruders/strateo3d_right_extruder.def.json | 1 - .../structur3d_discov3ry1_complete_um2plus_extruder_0.def.json | 1 - resources/extruders/tam_extruder_0.def.json | 1 - resources/extruders/tevo_blackwidow_extruder_0.def.json | 1 - resources/extruders/tevo_tarantula_extruder_0.def.json | 1 - resources/extruders/tevo_tornado_extruder_0.def.json | 1 - resources/extruders/tizyx_evy_dual_extruder_0.def.JSON | 1 - resources/extruders/tizyx_evy_dual_extruder_1.def.JSON | 1 - resources/extruders/tizyx_evy_extruder_0.def.JSON | 1 - resources/extruders/tizyx_k25_extruder_0.def.json | 1 - resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json | 1 - resources/extruders/ultimaker2_extended_extruder_0.def.json | 1 - resources/extruders/ultimaker2_extended_plus_extruder_0.def.json | 1 - resources/extruders/ultimaker2_extruder_0.def.json | 1 - resources/extruders/ultimaker2_go_extruder_0.def.json | 1 - resources/extruders/ultimaker2_plus_extruder_0.def.json | 1 - resources/extruders/ultimaker3_extended_extruder_left.def.json | 1 - resources/extruders/ultimaker3_extended_extruder_right.def.json | 1 - resources/extruders/ultimaker3_extruder_left.def.json | 1 - resources/extruders/ultimaker3_extruder_right.def.json | 1 - resources/extruders/ultimaker_original_dual_1st.def.json | 1 - resources/extruders/ultimaker_original_dual_2nd.def.json | 1 - resources/extruders/ultimaker_original_extruder_0.def.json | 1 - resources/extruders/ultimaker_original_plus_extruder_0.def.json | 1 - resources/extruders/ultimaker_s3_extruder_left.def.json | 1 - resources/extruders/ultimaker_s3_extruder_right.def.json | 1 - resources/extruders/ultimaker_s5_extruder_left.def.json | 1 - resources/extruders/ultimaker_s5_extruder_right.def.json | 1 - resources/extruders/uni_print_3d_extruder_0.def.json | 1 - resources/extruders/uniqbot_one_extruder_0.def.json | 1 - resources/extruders/vertex_delta_k8800_extruder_0.def.json | 1 - resources/extruders/vertex_k8400_dual_1st.def.json | 1 - resources/extruders/vertex_k8400_dual_2nd.def.json | 1 - resources/extruders/vertex_k8400_extruder_0.def.json | 1 - resources/extruders/wanhao_d4s_extruder_0.def.json | 1 - resources/extruders/wanhao_d6_extruder_0.def.json | 1 - resources/extruders/wanhao_d6_plus_extruder_0.def.json | 1 - resources/extruders/wanhao_d9_extruder_0.def.json | 1 - resources/extruders/wanhao_duplicator5S_extruder_0.def.json | 1 - resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json | 1 - resources/extruders/wanhao_i3_extruder_0.def.json | 1 - resources/extruders/wanhao_i3mini_extruder_0.def.json | 1 - resources/extruders/wanhao_i3plus_extruder_0.def.json | 1 - resources/extruders/z-bolt_extruder_0.def.json | 1 - resources/extruders/zone3d_printer_extruder_0.def.json | 1 - resources/extruders/zyyx_agile_extruder_0.def.json | 1 - 210 files changed, 210 deletions(-) diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index 0197426ac6..a644185915 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -1,5 +1,4 @@ { - "id": "BIBO2 dual", "version": 2, "name": "BIBO2 dual", "inherits": "fdmprinter", diff --git a/resources/definitions/creality_cr-x.def.json b/resources/definitions/creality_cr-x.def.json index 15bea1edf1..13409a7212 100644 --- a/resources/definitions/creality_cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -1,5 +1,4 @@ { - "id": "CR-X", "version": 2, "name": "Creality CR-X", "inherits": "fdmprinter", diff --git a/resources/definitions/cubicon_3dp_110f.def.json b/resources/definitions/cubicon_3dp_110f.def.json index 168b57cd66..eecfdd5911 100644 --- a/resources/definitions/cubicon_3dp_110f.def.json +++ b/resources/definitions/cubicon_3dp_110f.def.json @@ -1,5 +1,4 @@ { - "id": "3DP-110F", "version": 2, "name": "Cubicon Single", "inherits": "cubicon_common", diff --git a/resources/definitions/cubicon_3dp_210f.def.json b/resources/definitions/cubicon_3dp_210f.def.json index cc99899f92..5d8ff78487 100644 --- a/resources/definitions/cubicon_3dp_210f.def.json +++ b/resources/definitions/cubicon_3dp_210f.def.json @@ -1,5 +1,4 @@ { - "id": "3DP-210F", "version": 2, "name": "Cubicon Style", "inherits": "cubicon_common", diff --git a/resources/definitions/cubicon_3dp_310f.def.json b/resources/definitions/cubicon_3dp_310f.def.json index 90d0e3f25c..1dc78f0ebf 100644 --- a/resources/definitions/cubicon_3dp_310f.def.json +++ b/resources/definitions/cubicon_3dp_310f.def.json @@ -1,5 +1,4 @@ { - "id": "3DP-310F", "version": 2, "name": "Cubicon Single Plus", "inherits": "cubicon_common", diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json index 6b10a7f0cc..9c3bf571ae 100644 --- a/resources/definitions/flsun_qq_s.def.json +++ b/resources/definitions/flsun_qq_s.def.json @@ -1,5 +1,4 @@ { - "id": "flsun_qq_s", "version": 2, "name": "FLSUN QQ-S", "inherits": "fdmprinter", diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index 52b6ad8f7f..a700f4e473 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -1,5 +1,4 @@ { - "id": "geeetech_a30", "version": 2, "name": "Geeetech A30", "inherits": "fdmprinter", diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index b5e0efe27c..e98d6c02fe 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -1,5 +1,4 @@ { - "id": "gmax15plus", "version": 2, "name": "gMax 1.5 Plus", "inherits": "fdmprinter", diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 89ffda490a..aaba2cc55b 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -1,5 +1,4 @@ { - "id": "gmax15plus_dual", "version": 2, "name": "gMax 1.5 Plus Dual Extruder", "inherits": "fdmprinter", diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index cd3a068134..bb812b6dd6 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -1,5 +1,4 @@ { - "id": "malyan_m180", "version": 2, "name": "Malyan M180", "inherits": "fdmprinter", diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 13ad07ccae..fc8756ff6a 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -1,5 +1,4 @@ { - "id": "malyan_m200", "version": 2, "name": "Malyan M200", "inherits": "fdmprinter", diff --git a/resources/definitions/monoprice_select_mini_v1.def.json b/resources/definitions/monoprice_select_mini_v1.def.json index a516d54b18..4fe67fc92e 100644 --- a/resources/definitions/monoprice_select_mini_v1.def.json +++ b/resources/definitions/monoprice_select_mini_v1.def.json @@ -1,5 +1,4 @@ { - "id": "monoprice_select_mini_v1", "version": 2, "name": "Monoprice Select Mini V1", "inherits": "malyan_m200", diff --git a/resources/definitions/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json index bed4fb1adb..2364e49383 100644 --- a/resources/definitions/monoprice_select_mini_v2.def.json +++ b/resources/definitions/monoprice_select_mini_v2.def.json @@ -1,5 +1,4 @@ { - "id": "monoprice_select_mini_v2", "version": 2, "name": "Monoprice Select Mini V2 (E3D)", "inherits": "malyan_m200", diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 5157befc10..255d8f032b 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -1,5 +1,4 @@ { - "id": "ubuild-3d_mr_bot_280", "version": 2, "name": "uBuild-3D Mr Bot 280", "inherits": "fdmprinter", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 0d6834521e..7348c14a2a 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s3", "version": 2, "name": "Ultimaker S3", "inherits": "ultimaker", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 7eb37d0614..dcd44a371a 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s5", "version": 2, "name": "Ultimaker S5", "inherits": "ultimaker", diff --git a/resources/definitions/uni_print_3d.def.json b/resources/definitions/uni_print_3d.def.json index 427177176a..99d9eab1e0 100644 --- a/resources/definitions/uni_print_3d.def.json +++ b/resources/definitions/uni_print_3d.def.json @@ -1,5 +1,4 @@ { - "id": "uni_print_3d", "name": "UNI-PRINT-3D", "version": 2, "inherits": "fdmprinter", diff --git a/resources/extruders/101Hero_extruder_0.def.json b/resources/extruders/101Hero_extruder_0.def.json index 82c06e40d6..21c892133c 100644 --- a/resources/extruders/101Hero_extruder_0.def.json +++ b/resources/extruders/101Hero_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "101Hero_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/3dator_extruder_0.def.json b/resources/extruders/3dator_extruder_0.def.json index 6749eb7bb4..97b03518f7 100644 --- a/resources/extruders/3dator_extruder_0.def.json +++ b/resources/extruders/3dator_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "3dator_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 915c331083..27becf88ff 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -1,5 +1,4 @@ { - "id": "Mark2_extruder1", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index 2c05a09391..ac654d9c00 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -1,5 +1,4 @@ { - "id": "Mark2_extruder2", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/abax_pri3_extruder_0.def.json b/resources/extruders/abax_pri3_extruder_0.def.json index 27e86d6042..618ca7f596 100644 --- a/resources/extruders/abax_pri3_extruder_0.def.json +++ b/resources/extruders/abax_pri3_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "abax_pri3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/abax_pri5_extruder_0.def.json b/resources/extruders/abax_pri5_extruder_0.def.json index 842e76e5f3..4a96b5e12e 100644 --- a/resources/extruders/abax_pri5_extruder_0.def.json +++ b/resources/extruders/abax_pri5_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "abax_pri5_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/abax_titan_extruder_0.def.json b/resources/extruders/abax_titan_extruder_0.def.json index 79e1974def..078b9f0470 100644 --- a/resources/extruders/abax_titan_extruder_0.def.json +++ b/resources/extruders/abax_titan_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "abax_titan_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/alfawise_u20_extruder_0.def.json b/resources/extruders/alfawise_u20_extruder_0.def.json index 2fbe3f1772..6bb2bde534 100644 --- a/resources/extruders/alfawise_u20_extruder_0.def.json +++ b/resources/extruders/alfawise_u20_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "alfawise_u20_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/alfawise_u30_extruder_0.def.json b/resources/extruders/alfawise_u30_extruder_0.def.json index 37f59eb567..4014b5ab62 100644 --- a/resources/extruders/alfawise_u30_extruder_0.def.json +++ b/resources/extruders/alfawise_u30_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "alfawise_u30_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/alya3dp_extruder_0.def.json b/resources/extruders/alya3dp_extruder_0.def.json index 3676f01ad2..5e05210e2c 100644 --- a/resources/extruders/alya3dp_extruder_0.def.json +++ b/resources/extruders/alya3dp_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "alya3dp_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/anet_a6_extruder_0.def.json b/resources/extruders/anet_a6_extruder_0.def.json index 704d3a55ca..c87160a542 100644 --- a/resources/extruders/anet_a6_extruder_0.def.json +++ b/resources/extruders/anet_a6_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "anet_a6_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/anycubic_4max_extruder_0.def.json b/resources/extruders/anycubic_4max_extruder_0.def.json index 5c2ab8d479..9ea55928b8 100644 --- a/resources/extruders/anycubic_4max_extruder_0.def.json +++ b/resources/extruders/anycubic_4max_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "anycubic_4max_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/anycubic_chiron_extruder_0.def.json b/resources/extruders/anycubic_chiron_extruder_0.def.json index cc48df08bb..b4117c755a 100644 --- a/resources/extruders/anycubic_chiron_extruder_0.def.json +++ b/resources/extruders/anycubic_chiron_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "anycubic_chiron_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/anycubic_i3_mega_extruder_0.def.json b/resources/extruders/anycubic_i3_mega_extruder_0.def.json index 6d9c330536..f15eab4829 100644 --- a/resources/extruders/anycubic_i3_mega_extruder_0.def.json +++ b/resources/extruders/anycubic_i3_mega_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "anycubic_i3_mega_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bfb_extruder_0.def.json b/resources/extruders/bfb_extruder_0.def.json index 88c81ee03e..6dd995d098 100644 --- a/resources/extruders/bfb_extruder_0.def.json +++ b/resources/extruders/bfb_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bfb_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bibo2_dual_extruder_0.def.json b/resources/extruders/bibo2_dual_extruder_0.def.json index f83801fa0c..b918d070be 100644 --- a/resources/extruders/bibo2_dual_extruder_0.def.json +++ b/resources/extruders/bibo2_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "BIBO1", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bibo2_dual_extruder_1.def.json b/resources/extruders/bibo2_dual_extruder_1.def.json index 5f479ba54b..e0386188bb 100644 --- a/resources/extruders/bibo2_dual_extruder_1.def.json +++ b/resources/extruders/bibo2_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "BIBO2", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/bq_hephestos_2_extruder_0.def.json b/resources/extruders/bq_hephestos_2_extruder_0.def.json index 833907937d..d58d8d755a 100644 --- a/resources/extruders/bq_hephestos_2_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bq_hephestos_2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bq_hephestos_extruder_0.def.json b/resources/extruders/bq_hephestos_extruder_0.def.json index 753778f399..dc9b42d66d 100644 --- a/resources/extruders/bq_hephestos_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bq_hephestos_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bq_hephestos_xl_extruder_0.def.json b/resources/extruders/bq_hephestos_xl_extruder_0.def.json index 91cac04dc9..a52032f129 100644 --- a/resources/extruders/bq_hephestos_xl_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_xl_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bq_hephestos_xl_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bq_witbox_2_extruder_0.def.json b/resources/extruders/bq_witbox_2_extruder_0.def.json index 04107f4471..62fe62ad0b 100644 --- a/resources/extruders/bq_witbox_2_extruder_0.def.json +++ b/resources/extruders/bq_witbox_2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bq_witbox_2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/bq_witbox_extruder_0.def.json b/resources/extruders/bq_witbox_extruder_0.def.json index d3a5c677af..37b1492676 100644 --- a/resources/extruders/bq_witbox_extruder_0.def.json +++ b/resources/extruders/bq_witbox_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "bq_witbox_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_large_front.def.json b/resources/extruders/builder_premium_large_front.def.json index 4834bc8fd9..dc1c557304 100644 --- a/resources/extruders/builder_premium_large_front.def.json +++ b/resources/extruders/builder_premium_large_front.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_large_front", "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_large_rear.def.json b/resources/extruders/builder_premium_large_rear.def.json index f257749ea4..5dbe6d30c9 100644 --- a/resources/extruders/builder_premium_large_rear.def.json +++ b/resources/extruders/builder_premium_large_rear.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_large_rear", "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_medium_front.def.json b/resources/extruders/builder_premium_medium_front.def.json index 05dcb3d49f..2d38e48aab 100644 --- a/resources/extruders/builder_premium_medium_front.def.json +++ b/resources/extruders/builder_premium_medium_front.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_medium_front", "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_medium_rear.def.json b/resources/extruders/builder_premium_medium_rear.def.json index 3461e07f09..0a789c38f1 100644 --- a/resources/extruders/builder_premium_medium_rear.def.json +++ b/resources/extruders/builder_premium_medium_rear.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_medium_rear", "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_small_front.def.json b/resources/extruders/builder_premium_small_front.def.json index 7a1c352c73..b36c535aeb 100644 --- a/resources/extruders/builder_premium_small_front.def.json +++ b/resources/extruders/builder_premium_small_front.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_small_front", "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/builder_premium_small_rear.def.json b/resources/extruders/builder_premium_small_rear.def.json index 7085236a5c..8e00d0cc39 100644 --- a/resources/extruders/builder_premium_small_rear.def.json +++ b/resources/extruders/builder_premium_small_rear.def.json @@ -1,5 +1,4 @@ { - "id": "builder_premium_small_rear", "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 6d2b5f634e..ad27d4854c 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cartesio_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 3d49a220c0..1699a9c6a8 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "cartesio_extruder_1", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 1f8f8b9ca9..2521ada681 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -1,5 +1,4 @@ { - "id": "cartesio_extruder_2", "version": 2, "name": "Extruder 3", "inherits": "fdmextruder", diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index 0b1cfe493e..c844e7ce54 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -1,5 +1,4 @@ { - "id": "cartesio_extruder_3", "version": 2, "name": "Extruder 4", "inherits": "fdmextruder", diff --git a/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json b/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json index 26d847483d..dfa06c776a 100644 --- a/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json +++ b/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cocoon_create_modelmaker_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cr-x_extruder_0.def.json b/resources/extruders/cr-x_extruder_0.def.json index 8135815afb..4e73fd0e8e 100644 --- a/resources/extruders/cr-x_extruder_0.def.json +++ b/resources/extruders/cr-x_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cr-x_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/cr-x_extruder_1.def.json b/resources/extruders/cr-x_extruder_1.def.json index 9313f2ea78..ed6056dab9 100644 --- a/resources/extruders/cr-x_extruder_1.def.json +++ b/resources/extruders/cr-x_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "cr-x_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/creatable_d3_extruder_0.def.json b/resources/extruders/creatable_d3_extruder_0.def.json index 7d45bb8e8a..6a805febd5 100644 --- a/resources/extruders/creatable_d3_extruder_0.def.json +++ b/resources/extruders/creatable_d3_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "creatable_d3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_3dp_110f_extruder_0.def.json b/resources/extruders/cubicon_3dp_110f_extruder_0.def.json index 9c854fd2a1..048c12b992 100644 --- a/resources/extruders/cubicon_3dp_110f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_110f_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_3dp_110f_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_3dp_210f_extruder_0.def.json b/resources/extruders/cubicon_3dp_210f_extruder_0.def.json index 8a8573760a..07fe7f3769 100644 --- a/resources/extruders/cubicon_3dp_210f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_210f_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_3dp_210f_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_3dp_310f_extruder_0.def.json b/resources/extruders/cubicon_3dp_310f_extruder_0.def.json index 4edbbd5a6c..8dc336877f 100644 --- a/resources/extruders/cubicon_3dp_310f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_310f_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_3dp_310f_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json b/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json index 689be873e0..6c8993e799 100644 --- a/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json +++ b/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_dual_pro_a30_extruder_1", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json b/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json index c01a05a894..ccdfdee1f7 100644 --- a/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json +++ b/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_dual_pro_a30_extruder_2", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json b/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json index 18621ba429..12d022cd1e 100644 --- a/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json +++ b/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "cubicon_style_plus_a15_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_1.def.json b/resources/extruders/custom_extruder_1.def.json index 859c6a2f22..942f3e96b9 100644 --- a/resources/extruders/custom_extruder_1.def.json +++ b/resources/extruders/custom_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_1", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_2.def.json b/resources/extruders/custom_extruder_2.def.json index eecda5dfcd..cd43efa994 100644 --- a/resources/extruders/custom_extruder_2.def.json +++ b/resources/extruders/custom_extruder_2.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_2", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_3.def.json b/resources/extruders/custom_extruder_3.def.json index 77909ec05d..be5bdd0e6a 100644 --- a/resources/extruders/custom_extruder_3.def.json +++ b/resources/extruders/custom_extruder_3.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_3", "version": 2, "name": "Extruder 3", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_4.def.json b/resources/extruders/custom_extruder_4.def.json index be792c3a8e..ce1df0a5f5 100644 --- a/resources/extruders/custom_extruder_4.def.json +++ b/resources/extruders/custom_extruder_4.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_4", "version": 2, "name": "Extruder 4", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_5.def.json b/resources/extruders/custom_extruder_5.def.json index ea64605041..beb4786505 100644 --- a/resources/extruders/custom_extruder_5.def.json +++ b/resources/extruders/custom_extruder_5.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_5", "version": 2, "name": "Extruder 5", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_6.def.json b/resources/extruders/custom_extruder_6.def.json index fd27fadace..7f1e1a1343 100644 --- a/resources/extruders/custom_extruder_6.def.json +++ b/resources/extruders/custom_extruder_6.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_6", "version": 2, "name": "Extruder 6", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_7.def.json b/resources/extruders/custom_extruder_7.def.json index cf003d1a6b..e4239f35f0 100644 --- a/resources/extruders/custom_extruder_7.def.json +++ b/resources/extruders/custom_extruder_7.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_7", "version": 2, "name": "Extruder 7", "inherits": "fdmextruder", diff --git a/resources/extruders/custom_extruder_8.def.json b/resources/extruders/custom_extruder_8.def.json index f418a55186..7671825792 100644 --- a/resources/extruders/custom_extruder_8.def.json +++ b/resources/extruders/custom_extruder_8.def.json @@ -1,5 +1,4 @@ { - "id": "custom_extruder_8", "version": 2, "name": "Extruder 8", "inherits": "fdmextruder", diff --git a/resources/extruders/delta_go_extruder_0.def.json b/resources/extruders/delta_go_extruder_0.def.json index 2262270dfb..330cde08bf 100644 --- a/resources/extruders/delta_go_extruder_0.def.json +++ b/resources/extruders/delta_go_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "delta_go_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/deltabot_extruder_0.def.json b/resources/extruders/deltabot_extruder_0.def.json index e13d6a6ee3..d4773ccf9f 100644 --- a/resources/extruders/deltabot_extruder_0.def.json +++ b/resources/extruders/deltabot_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "deltabot_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/deltacomb_extruder_0.def.json b/resources/extruders/deltacomb_extruder_0.def.json index 64c512b7fe..875655d5c7 100755 --- a/resources/extruders/deltacomb_extruder_0.def.json +++ b/resources/extruders/deltacomb_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "deltacomb_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/deltacomb_extruder_1.def.json b/resources/extruders/deltacomb_extruder_1.def.json index 1657688482..b1f30f4624 100755 --- a/resources/extruders/deltacomb_extruder_1.def.json +++ b/resources/extruders/deltacomb_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "deltacomb_extruder_1", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/easyarts_ares_extruder_0.def.json b/resources/extruders/easyarts_ares_extruder_0.def.json index ec7ba81c57..4ddd476dbb 100644 --- a/resources/extruders/easyarts_ares_extruder_0.def.json +++ b/resources/extruders/easyarts_ares_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "easyarts_ares_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index 65bf515263..a9cea62897 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "erzay3d_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/fabtotum_extruder_0.def.json b/resources/extruders/fabtotum_extruder_0.def.json index 5ed4da6256..a763fbcc15 100644 --- a/resources/extruders/fabtotum_extruder_0.def.json +++ b/resources/extruders/fabtotum_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "fabtotum_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/felixpro2_dual_extruder_0.def.json b/resources/extruders/felixpro2_dual_extruder_0.def.json index 90c41a83b5..4278a532f9 100644 --- a/resources/extruders/felixpro2_dual_extruder_0.def.json +++ b/resources/extruders/felixpro2_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "felixpro2_dual_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/felixpro2_dual_extruder_1.def.json b/resources/extruders/felixpro2_dual_extruder_1.def.json index 3ff0d401fd..195aad474d 100644 --- a/resources/extruders/felixpro2_dual_extruder_1.def.json +++ b/resources/extruders/felixpro2_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "felixpro2_dual_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/felixtec4_dual_extruder_0.def.json b/resources/extruders/felixtec4_dual_extruder_0.def.json index 2a2d0468e1..1821b0e601 100644 --- a/resources/extruders/felixtec4_dual_extruder_0.def.json +++ b/resources/extruders/felixtec4_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "felixtec4_dual_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/felixtec4_dual_extruder_1.def.json b/resources/extruders/felixtec4_dual_extruder_1.def.json index 5d7e9c74a3..37a99c5fb4 100644 --- a/resources/extruders/felixtec4_dual_extruder_1.def.json +++ b/resources/extruders/felixtec4_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "felixtec4_dual_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/flsun_qq_extruder.def.json b/resources/extruders/flsun_qq_extruder.def.json index 7c93776836..c7ca0ed6eb 100644 --- a/resources/extruders/flsun_qq_extruder.def.json +++ b/resources/extruders/flsun_qq_extruder.def.json @@ -1,5 +1,4 @@ { - "id": "flsun_qq_extruder", "version": 2, "name": "Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/flsun_qq_s_extruder_0.def.json b/resources/extruders/flsun_qq_s_extruder_0.def.json index cba424e182..e61056fcd3 100644 --- a/resources/extruders/flsun_qq_s_extruder_0.def.json +++ b/resources/extruders/flsun_qq_s_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "flsun_qq_s_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/folgertech_FT-5_extruder_0.def.json b/resources/extruders/folgertech_FT-5_extruder_0.def.json index 8ba9d130c6..861b0e7a7e 100644 --- a/resources/extruders/folgertech_FT-5_extruder_0.def.json +++ b/resources/extruders/folgertech_FT-5_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "folgertech_FT-5_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/geeetech_a30_extruder_0.def.json b/resources/extruders/geeetech_a30_extruder_0.def.json index bc1d6a6ed6..90cb496877 100644 --- a/resources/extruders/geeetech_a30_extruder_0.def.json +++ b/resources/extruders/geeetech_a30_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "geeetech_a30_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/gmax15plus_dual_extruder_0.def.json b/resources/extruders/gmax15plus_dual_extruder_0.def.json index d3146a0576..45f35dee1f 100644 --- a/resources/extruders/gmax15plus_dual_extruder_0.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "gmax15plus_dual_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/gmax15plus_dual_extruder_1.def.json b/resources/extruders/gmax15plus_dual_extruder_1.def.json index 7b7354d794..6d0d5db06f 100644 --- a/resources/extruders/gmax15plus_dual_extruder_1.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "gmax15plus_dual_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/gmax15plus_extruder_0.def.json b/resources/extruders/gmax15plus_extruder_0.def.json index 70389745b3..5b0889d46d 100644 --- a/resources/extruders/gmax15plus_extruder_0.def.json +++ b/resources/extruders/gmax15plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "gmax15plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/grr_neo_extruder_0.def.json b/resources/extruders/grr_neo_extruder_0.def.json index 6d76c90796..a9f1fa4faa 100644 --- a/resources/extruders/grr_neo_extruder_0.def.json +++ b/resources/extruders/grr_neo_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "grr_neo_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/hBp_extruder_left.def.json b/resources/extruders/hBp_extruder_left.def.json index 7e71ca27a8..ce23f27c29 100644 --- a/resources/extruders/hBp_extruder_left.def.json +++ b/resources/extruders/hBp_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "hBp_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/hBp_extruder_right.def.json b/resources/extruders/hBp_extruder_right.def.json index acd2312268..170556a1fd 100644 --- a/resources/extruders/hBp_extruder_right.def.json +++ b/resources/extruders/hBp_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "hBp_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index c1e20140f3..3a1619d98b 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_1", "version": 2, "name": "Tool 1", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index a2015006dc..3a174f82b9 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_2", "version": 2, "name": "Tool 2", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_3.def.json b/resources/extruders/hms434_tool_3.def.json index b0199d5523..e1e237d332 100644 --- a/resources/extruders/hms434_tool_3.def.json +++ b/resources/extruders/hms434_tool_3.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_3", "version": 2, "name": "Tool 3", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_4.def.json b/resources/extruders/hms434_tool_4.def.json index 9346dafd67..1a68d5aff5 100644 --- a/resources/extruders/hms434_tool_4.def.json +++ b/resources/extruders/hms434_tool_4.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_4", "version": 2, "name": "Tool 4", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_5.def.json b/resources/extruders/hms434_tool_5.def.json index 051227fb1b..b56e8be84e 100644 --- a/resources/extruders/hms434_tool_5.def.json +++ b/resources/extruders/hms434_tool_5.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_5", "version": 2, "name": "Tool 5", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_6.def.json b/resources/extruders/hms434_tool_6.def.json index 056bb66741..b8c8cdf062 100644 --- a/resources/extruders/hms434_tool_6.def.json +++ b/resources/extruders/hms434_tool_6.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_6", "version": 2, "name": "Tool 6", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_7.def.json b/resources/extruders/hms434_tool_7.def.json index ff8f938e1c..3fc04078fa 100644 --- a/resources/extruders/hms434_tool_7.def.json +++ b/resources/extruders/hms434_tool_7.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_7", "version": 2, "name": "Tool 7", "inherits": "fdmextruder", diff --git a/resources/extruders/hms434_tool_8.def.json b/resources/extruders/hms434_tool_8.def.json index 2e9302e26c..faa6f36871 100644 --- a/resources/extruders/hms434_tool_8.def.json +++ b/resources/extruders/hms434_tool_8.def.json @@ -1,5 +1,4 @@ { - "id": "hms434_tool_8", "version": 2, "name": "Tool 8", "inherits": "fdmextruder", diff --git a/resources/extruders/imade3d_jellybox_2_extruder_0.def.json b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json index 1d50297343..ca25b62286 100644 --- a/resources/extruders/imade3d_jellybox_2_extruder_0.def.json +++ b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "imade3d_jellybox_2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/imade3d_jellybox_extruder_0.def.json b/resources/extruders/imade3d_jellybox_extruder_0.def.json index feaa717ee6..69c6d87d79 100644 --- a/resources/extruders/imade3d_jellybox_extruder_0.def.json +++ b/resources/extruders/imade3d_jellybox_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "imade3d_jellybox_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/innovo_inventor_extruder_0.def.json b/resources/extruders/innovo_inventor_extruder_0.def.json index ed599463f2..8758f3d516 100644 --- a/resources/extruders/innovo_inventor_extruder_0.def.json +++ b/resources/extruders/innovo_inventor_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "innovo_inventor_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/jgaurora_a1_extruder_0.def.json b/resources/extruders/jgaurora_a1_extruder_0.def.json index 71742b734a..f67d8d553e 100644 --- a/resources/extruders/jgaurora_a1_extruder_0.def.json +++ b/resources/extruders/jgaurora_a1_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "jgaurora_a1_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/jgaurora_a3s_extruder_0.def.json b/resources/extruders/jgaurora_a3s_extruder_0.def.json index 430867b38b..9a42d0da04 100644 --- a/resources/extruders/jgaurora_a3s_extruder_0.def.json +++ b/resources/extruders/jgaurora_a3s_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "jgaurora_a3s_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/jgaurora_a5_extruder_0.def.json b/resources/extruders/jgaurora_a5_extruder_0.def.json index fbc6ba77e6..5308c57934 100644 --- a/resources/extruders/jgaurora_a5_extruder_0.def.json +++ b/resources/extruders/jgaurora_a5_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "jgaurora_a5_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json b/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json index 41593a4821..58beaa4cc8 100644 --- a/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json +++ b/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "jgaurora_jgmaker_magic_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/jgaurora_z_603s_extruder_0.def.json b/resources/extruders/jgaurora_z_603s_extruder_0.def.json index 987425b28a..647016d5ff 100644 --- a/resources/extruders/jgaurora_z_603s_extruder_0.def.json +++ b/resources/extruders/jgaurora_z_603s_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "jgaurora_z_603s_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/julia_extruder_0.def.json b/resources/extruders/julia_extruder_0.def.json index 53a569ccd8..ef0ca83ac4 100644 --- a/resources/extruders/julia_extruder_0.def.json +++ b/resources/extruders/julia_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "julia_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/kemiq_q2_beta_extruder_0.def.json b/resources/extruders/kemiq_q2_beta_extruder_0.def.json index 0c7d1b7b50..79d55223f3 100644 --- a/resources/extruders/kemiq_q2_beta_extruder_0.def.json +++ b/resources/extruders/kemiq_q2_beta_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "kemiq_q2_beta_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/kemiq_q2_gama_extruder_0.def.json b/resources/extruders/kemiq_q2_gama_extruder_0.def.json index bb165ca35e..ad6e6372ee 100644 --- a/resources/extruders/kemiq_q2_gama_extruder_0.def.json +++ b/resources/extruders/kemiq_q2_gama_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "kemiq_q2_gama_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/key3d_tyro_extruder_0.def.json b/resources/extruders/key3d_tyro_extruder_0.def.json index 6d5b83a1ef..11619da332 100644 --- a/resources/extruders/key3d_tyro_extruder_0.def.json +++ b/resources/extruders/key3d_tyro_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "key3d_tyro_extruder_0", "version": 2, "name": "0.4mm Nozzle", "inherits": "fdmextruder", diff --git a/resources/extruders/kossel_mini_extruder_0.def.json b/resources/extruders/kossel_mini_extruder_0.def.json index f57154e1a3..7da2cff3b1 100644 --- a/resources/extruders/kossel_mini_extruder_0.def.json +++ b/resources/extruders/kossel_mini_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "kossel_mini_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/kossel_pro_extruder_0.def.json b/resources/extruders/kossel_pro_extruder_0.def.json index 921e1d8bb4..48c1180f84 100644 --- a/resources/extruders/kossel_pro_extruder_0.def.json +++ b/resources/extruders/kossel_pro_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "kossel_pro_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/kupido_extruder_0.def.json b/resources/extruders/kupido_extruder_0.def.json index ef988d4fde..784e453bd1 100644 --- a/resources/extruders/kupido_extruder_0.def.json +++ b/resources/extruders/kupido_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "kupido_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/makeR_pegasus_extruder_0.def.json b/resources/extruders/makeR_pegasus_extruder_0.def.json index e37891abde..c17c51d599 100644 --- a/resources/extruders/makeR_pegasus_extruder_0.def.json +++ b/resources/extruders/makeR_pegasus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "makeR_pegasus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json index a80d4079cb..278981f355 100644 --- a/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json +++ b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "makeR_prusa_tairona_i3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/makeit_dual_1st.def.json b/resources/extruders/makeit_dual_1st.def.json index 0f5a716e16..16374b40d1 100644 --- a/resources/extruders/makeit_dual_1st.def.json +++ b/resources/extruders/makeit_dual_1st.def.json @@ -1,5 +1,4 @@ { - "id": "makeit_dual_1st", "version": 2, "name": "1st Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/makeit_dual_2nd.def.json b/resources/extruders/makeit_dual_2nd.def.json index f93d670c85..562cfcbc40 100644 --- a/resources/extruders/makeit_dual_2nd.def.json +++ b/resources/extruders/makeit_dual_2nd.def.json @@ -1,5 +1,4 @@ { - "id": "makeit_dual_2nd", "version": 2, "name": "2nd Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/makeit_l_dual_1st.def.json b/resources/extruders/makeit_l_dual_1st.def.json index 6a9e8e3fc1..8fbc2944b1 100644 --- a/resources/extruders/makeit_l_dual_1st.def.json +++ b/resources/extruders/makeit_l_dual_1st.def.json @@ -1,5 +1,4 @@ { - "id": "makeit_l_dual_1st", "version": 2, "name": "1st Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/makeit_l_dual_2nd.def.json b/resources/extruders/makeit_l_dual_2nd.def.json index 72b86b22e4..e163e9565a 100644 --- a/resources/extruders/makeit_l_dual_2nd.def.json +++ b/resources/extruders/makeit_l_dual_2nd.def.json @@ -1,5 +1,4 @@ { - "id": "makeit_l_dual_2nd", "version": 2, "name": "2nd Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index ee94250248..76e2f74a4c 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "maker_starter_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/makerbotreplicator_extruder_0.def.json b/resources/extruders/makerbotreplicator_extruder_0.def.json index 36a975ace1..595134d788 100644 --- a/resources/extruders/makerbotreplicator_extruder_0.def.json +++ b/resources/extruders/makerbotreplicator_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "makerbotreplicator_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/malyan_m180_extruder_0.def.json b/resources/extruders/malyan_m180_extruder_0.def.json index bdf5350b26..04bc70ce55 100644 --- a/resources/extruders/malyan_m180_extruder_0.def.json +++ b/resources/extruders/malyan_m180_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "malyan_m180_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/malyan_m200_extruder_0.def.json b/resources/extruders/malyan_m200_extruder_0.def.json index 4a135aa72d..88d99fb426 100644 --- a/resources/extruders/malyan_m200_extruder_0.def.json +++ b/resources/extruders/malyan_m200_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "malyan_m200_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json index 032a577022..4cb893336e 100644 --- a/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json +++ b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "mankati_fullscale_xt_plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 3ee2fd2b10..2ea4d9a7de 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "mendel90_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json index e4a899d7af..023bd6b27c 100644 --- a/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json +++ b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "monoprice_select_mini_v1_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json index b727cfce1f..79ba110701 100644 --- a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json +++ b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "monoprice_select_mini_v2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/nwa3d_a31_extruder_0.def.json b/resources/extruders/nwa3d_a31_extruder_0.def.json index 999fe37d28..de1938956a 100644 --- a/resources/extruders/nwa3d_a31_extruder_0.def.json +++ b/resources/extruders/nwa3d_a31_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "nwa3d_a31_extruder_0", "version": 2, "name": "Standard 0.4mm", "inherits": "fdmextruder", diff --git a/resources/extruders/nwa3d_a5_extruder_0.def.json b/resources/extruders/nwa3d_a5_extruder_0.def.json index 5c3cc6a127..9131480732 100644 --- a/resources/extruders/nwa3d_a5_extruder_0.def.json +++ b/resources/extruders/nwa3d_a5_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "nwa3d_a5_extruder_0", "version": 2, "name": "Regular 0.4mm Nozzle", "inherits": "fdmextruder", diff --git a/resources/extruders/ord_extruder_0.def.json b/resources/extruders/ord_extruder_0.def.json index 317ad70a3c..61317c4a17 100644 --- a/resources/extruders/ord_extruder_0.def.json +++ b/resources/extruders/ord_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ord_extruder_0", "version": 2, "name": "0", "inherits": "fdmextruder", diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json index 6e29ad2f2b..43bc11fa71 100644 --- a/resources/extruders/ord_extruder_1.def.json +++ b/resources/extruders/ord_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "ord_extruder_1", "version": 2, "name": "1", "inherits": "fdmextruder", diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json index 849930c988..84bcbd5332 100644 --- a/resources/extruders/ord_extruder_2.def.json +++ b/resources/extruders/ord_extruder_2.def.json @@ -1,5 +1,4 @@ { - "id": "ord_extruder_2", "version": 2, "name": "2", "inherits": "fdmextruder", diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json index eb3676c14f..db81f82b78 100644 --- a/resources/extruders/ord_extruder_3.def.json +++ b/resources/extruders/ord_extruder_3.def.json @@ -1,5 +1,4 @@ { - "id": "ord_extruder_3", "version": 2, "name": "3", "inherits": "fdmextruder", diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json index 291e9e5501..2ca7609e06 100644 --- a/resources/extruders/ord_extruder_4.def.json +++ b/resources/extruders/ord_extruder_4.def.json @@ -1,5 +1,4 @@ { - "id": "ord_extruder_4", "version": 2, "name": "4", "inherits": "fdmextruder", diff --git a/resources/extruders/peopoly_moai_extruder_0.def.json b/resources/extruders/peopoly_moai_extruder_0.def.json index bbffd4ac4d..1acf5b499f 100644 --- a/resources/extruders/peopoly_moai_extruder_0.def.json +++ b/resources/extruders/peopoly_moai_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "peopoly_moai_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/printrbot_play_extruder_0.def.json b/resources/extruders/printrbot_play_extruder_0.def.json index ef1284758b..682810c8d8 100644 --- a/resources/extruders/printrbot_play_extruder_0.def.json +++ b/resources/extruders/printrbot_play_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "printrbot_play_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/printrbot_play_heated_extruder_0.def.json b/resources/extruders/printrbot_play_heated_extruder_0.def.json index 0a3eeb3d06..72335e82d6 100644 --- a/resources/extruders/printrbot_play_heated_extruder_0.def.json +++ b/resources/extruders/printrbot_play_heated_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "printrbot_play_heated_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/printrbot_simple_extended_extruder_0.def.json b/resources/extruders/printrbot_simple_extended_extruder_0.def.json index 71c8863552..b50a142d2e 100644 --- a/resources/extruders/printrbot_simple_extended_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_extended_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "printrbot_simple_extended_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/printrbot_simple_extruder_0.def.json b/resources/extruders/printrbot_simple_extruder_0.def.json index e97977e07e..4fa5d7fbf2 100644 --- a/resources/extruders/printrbot_simple_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "printrbot_simple_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json index f002bb9cf5..a58195fdfb 100644 --- a/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "printrbot_simple_makers_kit_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/prusa_i3_extruder_0.def.json b/resources/extruders/prusa_i3_extruder_0.def.json index 11c52e062b..dbb01032b8 100644 --- a/resources/extruders/prusa_i3_extruder_0.def.json +++ b/resources/extruders/prusa_i3_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "prusa_i3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/prusa_i3_mk2_extruder_0.def.json b/resources/extruders/prusa_i3_mk2_extruder_0.def.json index a56aae4300..e802687062 100644 --- a/resources/extruders/prusa_i3_mk2_extruder_0.def.json +++ b/resources/extruders/prusa_i3_mk2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "prusa_i3_mk2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/prusa_i3_xl_extruder_0.def.json b/resources/extruders/prusa_i3_xl_extruder_0.def.json index 5dc2ab3bc0..c4125b36ee 100644 --- a/resources/extruders/prusa_i3_xl_extruder_0.def.json +++ b/resources/extruders/prusa_i3_xl_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "prusa_i3_xl_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/punchtec_connect_xl_extruder_0.def.json b/resources/extruders/punchtec_connect_xl_extruder_0.def.json index 68c3d8c906..f286140167 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_0.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "punchtec_connect_xl_extruder_0", "version": 2, "name": "0", "inherits": "fdmextruder", diff --git a/resources/extruders/punchtec_connect_xl_extruder_1.def.json b/resources/extruders/punchtec_connect_xl_extruder_1.def.json index a2e4b31714..47d28882cf 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_1.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "punchtec_connect_xl_extruder_1", "version": 2, "name": "1", "inherits": "fdmextruder", diff --git a/resources/extruders/raise3D_N2_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_dual_extruder_0.def.json index 48746969d3..9294a73933 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_dual_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/raise3D_N2_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_dual_extruder_1.def.json index 8ea6f95b16..e09cb6b9fc 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_dual_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json index fc7531cf1b..d8821204f0 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_plus_dual_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json index 83f949bb22..0a6ded63a3 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_plus_dual_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/raise3D_N2_single_extruder_0.def.json b/resources/extruders/raise3D_N2_single_extruder_0.def.json index 08fedff99c..399d577110 100644 --- a/resources/extruders/raise3D_N2_single_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_single_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "raise3D_N2_single_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/renkforce_rf100_extruder_0.def.json b/resources/extruders/renkforce_rf100_extruder_0.def.json index 6a7f883309..ff64e2f86a 100644 --- a/resources/extruders/renkforce_rf100_extruder_0.def.json +++ b/resources/extruders/renkforce_rf100_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "renkforce_rf100_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_3rdgen_extruder_0.def.json b/resources/extruders/rigid3d_3rdgen_extruder_0.def.json index e309086a72..edc87f695e 100644 --- a/resources/extruders/rigid3d_3rdgen_extruder_0.def.json +++ b/resources/extruders/rigid3d_3rdgen_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_3rdgen_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_extruder_0.def.json b/resources/extruders/rigid3d_extruder_0.def.json index e34987cd6e..eaac6b16a0 100644 --- a/resources/extruders/rigid3d_extruder_0.def.json +++ b/resources/extruders/rigid3d_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_hobby_extruder_0.def.json b/resources/extruders/rigid3d_hobby_extruder_0.def.json index 681aeecb43..68dd523af3 100644 --- a/resources/extruders/rigid3d_hobby_extruder_0.def.json +++ b/resources/extruders/rigid3d_hobby_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_hobby_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_mucit_extruder_0.def.json b/resources/extruders/rigid3d_mucit_extruder_0.def.json index af3f54e150..de72db7a33 100644 --- a/resources/extruders/rigid3d_mucit_extruder_0.def.json +++ b/resources/extruders/rigid3d_mucit_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_mucit_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_zero2_extruder_0.def.json b/resources/extruders/rigid3d_zero2_extruder_0.def.json index 30d1dbb3c4..051ce2384d 100644 --- a/resources/extruders/rigid3d_zero2_extruder_0.def.json +++ b/resources/extruders/rigid3d_zero2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_zero2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigid3d_zero_extruder_0.def.json b/resources/extruders/rigid3d_zero_extruder_0.def.json index 6c5ae10ddb..76a8fceaae 100644 --- a/resources/extruders/rigid3d_zero_extruder_0.def.json +++ b/resources/extruders/rigid3d_zero_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigid3d_zero_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigidbot_big_extruder_0.def.json b/resources/extruders/rigidbot_big_extruder_0.def.json index 2b07adaaaa..9ef72d5203 100644 --- a/resources/extruders/rigidbot_big_extruder_0.def.json +++ b/resources/extruders/rigidbot_big_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigidbot_big_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/rigidbot_extruder_0.def.json b/resources/extruders/rigidbot_extruder_0.def.json index 32ce3fc1c3..9155be0ff1 100644 --- a/resources/extruders/rigidbot_extruder_0.def.json +++ b/resources/extruders/rigidbot_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "rigidbot_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/robo_3d_r1_extruder_0.def.json b/resources/extruders/robo_3d_r1_extruder_0.def.json index 0872e91a11..60811842ac 100644 --- a/resources/extruders/robo_3d_r1_extruder_0.def.json +++ b/resources/extruders/robo_3d_r1_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "robo_3d_r1_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/seemecnc_artemis_extruder_0.def.json b/resources/extruders/seemecnc_artemis_extruder_0.def.json index a709a80cbf..a86e5eb2bd 100644 --- a/resources/extruders/seemecnc_artemis_extruder_0.def.json +++ b/resources/extruders/seemecnc_artemis_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "seemecnc_artemis_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/seemecnc_v32_extruder_0.def.json b/resources/extruders/seemecnc_v32_extruder_0.def.json index 5bd489e537..b223116be3 100644 --- a/resources/extruders/seemecnc_v32_extruder_0.def.json +++ b/resources/extruders/seemecnc_v32_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "seemecnc_v32_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/stereotech_start_extruder_0.def.json b/resources/extruders/stereotech_start_extruder_0.def.json index 8658944ebd..b0a1e91d1c 100644 --- a/resources/extruders/stereotech_start_extruder_0.def.json +++ b/resources/extruders/stereotech_start_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "stereotech_start_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/stereotech_ste320_1st.def.json b/resources/extruders/stereotech_ste320_1st.def.json index ffbf5bde2f..8110775d33 100644 --- a/resources/extruders/stereotech_ste320_1st.def.json +++ b/resources/extruders/stereotech_ste320_1st.def.json @@ -1,5 +1,4 @@ { - "id": "stereotech_ste320_1st", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/stereotech_ste320_2nd.def.json b/resources/extruders/stereotech_ste320_2nd.def.json index ae1b8f0f15..12a1479164 100644 --- a/resources/extruders/stereotech_ste320_2nd.def.json +++ b/resources/extruders/stereotech_ste320_2nd.def.json @@ -1,5 +1,4 @@ { - "id": "stereotech_ste320_2nd", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/strateo3d_left_extruder.def.json b/resources/extruders/strateo3d_left_extruder.def.json index 1df8eb0ebb..096b265030 100644 --- a/resources/extruders/strateo3d_left_extruder.def.json +++ b/resources/extruders/strateo3d_left_extruder.def.json @@ -1,5 +1,4 @@ { - "id": "strateo3d_left_extruder", "version": 2, "name": "Left Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/strateo3d_right_extruder.def.json b/resources/extruders/strateo3d_right_extruder.def.json index ea59870329..24acdef8b5 100644 --- a/resources/extruders/strateo3d_right_extruder.def.json +++ b/resources/extruders/strateo3d_right_extruder.def.json @@ -1,5 +1,4 @@ { - "id": "strateo3d_right_extruder", "version": 2, "name": "Right Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index 8436dc0a94..c63f740f11 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "structur3d_discov3ry1_complete_um2plus_extruder_0", "version": 2, "name": "Discov3ry Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index fc53efad3f..f487a6ff90 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "tam_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/tevo_blackwidow_extruder_0.def.json b/resources/extruders/tevo_blackwidow_extruder_0.def.json index 125cf19c98..3450b36ac6 100644 --- a/resources/extruders/tevo_blackwidow_extruder_0.def.json +++ b/resources/extruders/tevo_blackwidow_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "tevo_blackwidow_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/tevo_tarantula_extruder_0.def.json b/resources/extruders/tevo_tarantula_extruder_0.def.json index bc43986814..a2ac48c06d 100644 --- a/resources/extruders/tevo_tarantula_extruder_0.def.json +++ b/resources/extruders/tevo_tarantula_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "tevo_tarantula_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/tevo_tornado_extruder_0.def.json b/resources/extruders/tevo_tornado_extruder_0.def.json index b47a757113..6c0c9f39b1 100644 --- a/resources/extruders/tevo_tornado_extruder_0.def.json +++ b/resources/extruders/tevo_tornado_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "tevo_tornado_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/tizyx_evy_dual_extruder_0.def.JSON b/resources/extruders/tizyx_evy_dual_extruder_0.def.JSON index 59e9311e50..282d9d2651 100644 --- a/resources/extruders/tizyx_evy_dual_extruder_0.def.JSON +++ b/resources/extruders/tizyx_evy_dual_extruder_0.def.JSON @@ -1,5 +1,4 @@ { - "id": "tizyx_evy_dual_extruder_0", "version": 2, "name": "Classic Extruder", "inherits": "fdmextruder", diff --git a/resources/extruders/tizyx_evy_dual_extruder_1.def.JSON b/resources/extruders/tizyx_evy_dual_extruder_1.def.JSON index cf5dc76caa..69e4a60952 100644 --- a/resources/extruders/tizyx_evy_dual_extruder_1.def.JSON +++ b/resources/extruders/tizyx_evy_dual_extruder_1.def.JSON @@ -1,5 +1,4 @@ { - "id": "tizyx_evy_dual_extruder_1", "version": 2, "name": "Direct Drive", "inherits": "fdmextruder", diff --git a/resources/extruders/tizyx_evy_extruder_0.def.JSON b/resources/extruders/tizyx_evy_extruder_0.def.JSON index bd3c4c9792..4f93648491 100644 --- a/resources/extruders/tizyx_evy_extruder_0.def.JSON +++ b/resources/extruders/tizyx_evy_extruder_0.def.JSON @@ -1,5 +1,4 @@ { - "id": "tizyx_evy_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/tizyx_k25_extruder_0.def.json b/resources/extruders/tizyx_k25_extruder_0.def.json index 409198d77c..626fedf434 100644 --- a/resources/extruders/tizyx_k25_extruder_0.def.json +++ b/resources/extruders/tizyx_k25_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "tizyx_k25_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json index b04ca0dcbf..749a5ed77d 100644 --- a/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json +++ b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ubuild-3d_mr_bot_280_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker2_extended_extruder_0.def.json b/resources/extruders/ultimaker2_extended_extruder_0.def.json index 6387ec72ed..cc7306a393 100644 --- a/resources/extruders/ultimaker2_extended_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extended_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker2_extended_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json index 39fc665ff2..337c120097 100644 --- a/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker2_extended_plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 2daf57c73f..64ac8698f1 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker2_go_extruder_0.def.json b/resources/extruders/ultimaker2_go_extruder_0.def.json index 4c258e237e..5ddcfbd551 100644 --- a/resources/extruders/ultimaker2_go_extruder_0.def.json +++ b/resources/extruders/ultimaker2_go_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker2_go_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index 13ab0c59ea..abf36c0b08 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker2_plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker3_extended_extruder_left.def.json b/resources/extruders/ultimaker3_extended_extruder_left.def.json index 2d81424bc6..fbc49a1f32 100644 --- a/resources/extruders/ultimaker3_extended_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker3_extended_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker3_extended_extruder_right.def.json b/resources/extruders/ultimaker3_extended_extruder_right.def.json index 7cdd5876c1..fbe6bcc878 100644 --- a/resources/extruders/ultimaker3_extended_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker3_extended_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker3_extruder_left.def.json b/resources/extruders/ultimaker3_extruder_left.def.json index 9f5ed34692..b18e2decfa 100644 --- a/resources/extruders/ultimaker3_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker3_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker3_extruder_right.def.json b/resources/extruders/ultimaker3_extruder_right.def.json index 7298a552b7..4753fde489 100644 --- a/resources/extruders/ultimaker3_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker3_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_original_dual_1st.def.json b/resources/extruders/ultimaker_original_dual_1st.def.json index 3d837fc989..acc8168d94 100644 --- a/resources/extruders/ultimaker_original_dual_1st.def.json +++ b/resources/extruders/ultimaker_original_dual_1st.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_original_dual_1st", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_original_dual_2nd.def.json b/resources/extruders/ultimaker_original_dual_2nd.def.json index 80cc17c58d..7907571e66 100644 --- a/resources/extruders/ultimaker_original_dual_2nd.def.json +++ b/resources/extruders/ultimaker_original_dual_2nd.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_original_dual_2nd", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_original_extruder_0.def.json b/resources/extruders/ultimaker_original_extruder_0.def.json index 4aab693212..30df96df58 100644 --- a/resources/extruders/ultimaker_original_extruder_0.def.json +++ b/resources/extruders/ultimaker_original_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_original_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_original_plus_extruder_0.def.json b/resources/extruders/ultimaker_original_plus_extruder_0.def.json index 91d0751861..fec40e93a9 100644 --- a/resources/extruders/ultimaker_original_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker_original_plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_original_plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_s3_extruder_left.def.json b/resources/extruders/ultimaker_s3_extruder_left.def.json index 61d3149e0b..7af6f7d0dc 100644 --- a/resources/extruders/ultimaker_s3_extruder_left.def.json +++ b/resources/extruders/ultimaker_s3_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s3_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_s3_extruder_right.def.json b/resources/extruders/ultimaker_s3_extruder_right.def.json index efcb6ae06a..6771e1c0a8 100644 --- a/resources/extruders/ultimaker_s3_extruder_right.def.json +++ b/resources/extruders/ultimaker_s3_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s3_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_s5_extruder_left.def.json b/resources/extruders/ultimaker_s5_extruder_left.def.json index 275f60bb31..24de85e9cc 100644 --- a/resources/extruders/ultimaker_s5_extruder_left.def.json +++ b/resources/extruders/ultimaker_s5_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s5_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/ultimaker_s5_extruder_right.def.json b/resources/extruders/ultimaker_s5_extruder_right.def.json index 92e08f5cc5..1e0ac3eace 100644 --- a/resources/extruders/ultimaker_s5_extruder_right.def.json +++ b/resources/extruders/ultimaker_s5_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "ultimaker_s5_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/uni_print_3d_extruder_0.def.json b/resources/extruders/uni_print_3d_extruder_0.def.json index d0711fd458..747fb9e020 100644 --- a/resources/extruders/uni_print_3d_extruder_0.def.json +++ b/resources/extruders/uni_print_3d_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "uni_print_3d_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/uniqbot_one_extruder_0.def.json b/resources/extruders/uniqbot_one_extruder_0.def.json index 65436ee789..0a8982559d 100644 --- a/resources/extruders/uniqbot_one_extruder_0.def.json +++ b/resources/extruders/uniqbot_one_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "uniqbot_one_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/vertex_delta_k8800_extruder_0.def.json b/resources/extruders/vertex_delta_k8800_extruder_0.def.json index 5e09046faf..05a010222f 100644 --- a/resources/extruders/vertex_delta_k8800_extruder_0.def.json +++ b/resources/extruders/vertex_delta_k8800_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "vertex_delta_k8800_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json index 86fb2266ba..947cfbc7d8 100644 --- a/resources/extruders/vertex_k8400_dual_1st.def.json +++ b/resources/extruders/vertex_k8400_dual_1st.def.json @@ -1,5 +1,4 @@ { - "id": "vertex_k8400_dual_1st", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json index 306b2dcb7a..e606e46337 100644 --- a/resources/extruders/vertex_k8400_dual_2nd.def.json +++ b/resources/extruders/vertex_k8400_dual_2nd.def.json @@ -1,5 +1,4 @@ { - "id": "vertex_k8400_dual_2nd", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/vertex_k8400_extruder_0.def.json b/resources/extruders/vertex_k8400_extruder_0.def.json index c03453b519..e0304f57bd 100644 --- a/resources/extruders/vertex_k8400_extruder_0.def.json +++ b/resources/extruders/vertex_k8400_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "vertex_k8400_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_d4s_extruder_0.def.json b/resources/extruders/wanhao_d4s_extruder_0.def.json index 9a750e072c..bd6023faf4 100644 --- a/resources/extruders/wanhao_d4s_extruder_0.def.json +++ b/resources/extruders/wanhao_d4s_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_d4s_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_d6_extruder_0.def.json b/resources/extruders/wanhao_d6_extruder_0.def.json index a8a3bf15d3..093546eabf 100644 --- a/resources/extruders/wanhao_d6_extruder_0.def.json +++ b/resources/extruders/wanhao_d6_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_d6_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_d6_plus_extruder_0.def.json b/resources/extruders/wanhao_d6_plus_extruder_0.def.json index b2b1e6ab05..acc5b66072 100644 --- a/resources/extruders/wanhao_d6_plus_extruder_0.def.json +++ b/resources/extruders/wanhao_d6_plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_d6_plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_d9_extruder_0.def.json b/resources/extruders/wanhao_d9_extruder_0.def.json index 76d501e5a2..40fcf422f5 100644 --- a/resources/extruders/wanhao_d9_extruder_0.def.json +++ b/resources/extruders/wanhao_d9_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_d9_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_duplicator5S_extruder_0.def.json b/resources/extruders/wanhao_duplicator5S_extruder_0.def.json index 74f47158a3..7274d5117e 100644 --- a/resources/extruders/wanhao_duplicator5S_extruder_0.def.json +++ b/resources/extruders/wanhao_duplicator5S_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_duplicator5S_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json b/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json index 8c91de4685..3479c94e35 100644 --- a/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json +++ b/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_duplicator5Smini_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_i3_extruder_0.def.json b/resources/extruders/wanhao_i3_extruder_0.def.json index 7d881079c4..387a456ff2 100644 --- a/resources/extruders/wanhao_i3_extruder_0.def.json +++ b/resources/extruders/wanhao_i3_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_i3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_i3mini_extruder_0.def.json b/resources/extruders/wanhao_i3mini_extruder_0.def.json index c5abbd175e..2d52f0d126 100644 --- a/resources/extruders/wanhao_i3mini_extruder_0.def.json +++ b/resources/extruders/wanhao_i3mini_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_i3mini_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/wanhao_i3plus_extruder_0.def.json b/resources/extruders/wanhao_i3plus_extruder_0.def.json index 0dae64ce63..103e3b9335 100644 --- a/resources/extruders/wanhao_i3plus_extruder_0.def.json +++ b/resources/extruders/wanhao_i3plus_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "wanhao_i3plus_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/z-bolt_extruder_0.def.json b/resources/extruders/z-bolt_extruder_0.def.json index 70e9f6177c..04c8d10cbb 100644 --- a/resources/extruders/z-bolt_extruder_0.def.json +++ b/resources/extruders/z-bolt_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "z-bolt_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/zone3d_printer_extruder_0.def.json b/resources/extruders/zone3d_printer_extruder_0.def.json index ca024dd5c4..fb8f40d3e2 100644 --- a/resources/extruders/zone3d_printer_extruder_0.def.json +++ b/resources/extruders/zone3d_printer_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "zone3d_printer_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/zyyx_agile_extruder_0.def.json b/resources/extruders/zyyx_agile_extruder_0.def.json index edda9b3097..c01ffb59f3 100644 --- a/resources/extruders/zyyx_agile_extruder_0.def.json +++ b/resources/extruders/zyyx_agile_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "zyyx_agile_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", From 985aac9e601337d310b5a9c3e9160ed39852104e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 11:01:16 +0200 Subject: [PATCH 707/994] Assert that there is no ID metadata entry in definition containers --- tests/Settings/TestDefinitionContainer.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 73d10d871c..6e502280cd 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -58,7 +58,7 @@ def assertIsDefinitionValid(definition_container, path, file_name): # definition that defines a "value", the "default_value" is ineffective. This # test fails on those things. @pytest.mark.parametrize("file_name", machine_filepaths) -def test_validateOverridingDefaultValue(file_name): +def test_validateOverridingDefaultValue(file_name: str): definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name) with open(definition_path, encoding = "utf-8") as f: doc = json.load(f) @@ -124,4 +124,16 @@ def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, An result[key] = merge_dicts(result[key], val) else: result[key] = val - return result \ No newline at end of file + return result + +## Verifies that definition contains don't have an ID field. +# +# ID fields are legacy. They should not be used any more. This is legacy that +# people don't seem to be able to get used to. +@pytest.mark.parametrize("file_name", machine_filepaths) +def test_noId(file_name): + definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name) + with open(definition_path, encoding = "utf-8") as f: + doc = json.load(f) + + assert "id" not in doc, "Definitions should not have an ID field." \ No newline at end of file From 6a5c6c1b163b77af3348b77e4cfd9607743c9215 Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Tue, 22 Oct 2019 11:15:52 +0200 Subject: [PATCH 708/994] removed id --- resources/extruders/skriware_2_extruder_0.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/extruders/skriware_2_extruder_0.def.json b/resources/extruders/skriware_2_extruder_0.def.json index c2909aa9df..0569600094 100644 --- a/resources/extruders/skriware_2_extruder_0.def.json +++ b/resources/extruders/skriware_2_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "skriware_2_extruder_0", "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", From ad64c9e19a889e569bbcb987bd9870aa22918900 Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Tue, 22 Oct 2019 11:16:17 +0200 Subject: [PATCH 709/994] removed id --- resources/extruders/skriware_2_extruder_1.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/extruders/skriware_2_extruder_1.def.json b/resources/extruders/skriware_2_extruder_1.def.json index 2fedd3dcff..d6fa76e1a0 100644 --- a/resources/extruders/skriware_2_extruder_1.def.json +++ b/resources/extruders/skriware_2_extruder_1.def.json @@ -1,5 +1,4 @@ { - "id": "skriware_2_extruder_1", "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", From fc0b8185b7df0f223a67f24384e3e6bad663c8a1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 11:37:33 +0200 Subject: [PATCH 710/994] Fix setMetaDataEntry() dependency on ContainerRegistery CURA-6920 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index fe0f73f2b3..093638d594 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -76,7 +76,9 @@ class XmlMaterialProfile(InstanceContainer): new_setting_values_dict[self.__material_properties_setting_map[k]] = v if not apply_to_all: # Historical: If you only want to modify THIS container. We only used that to prevent recursion but with the below code that's no longer necessary. - container_query = registry.findContainers(id = self.getId()) + # CURA-6920: This is an optimization, but it also fixes the problem that you can only set metadata for a + # material container that can be found in the container registry. + container_query = [self] else: container_query = registry.findContainers(base_file = self.getMetaDataEntry("base_file")) From cb9b385a851958b3a71450a1d661f905efb09826 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 13:46:21 +0200 Subject: [PATCH 711/994] Remove Alternate Skin Rotations setting It's been replaced completely by the Top/Bottom Line Directions setting. --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 6 ++++++ resources/definitions/fdmprinter.def.json | 10 ---------- resources/setting_visibility/expert.cfg | 1 - 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 195bc70016..4858c6f9bf 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -2,6 +2,7 @@ import configparser from typing import Tuple, List import io from UM.VersionUpgrade import VersionUpgrade +from UM.Util import parseBool # To parse whether the Alternate Skin Rotations function is activated. _renamed_container_id_map = { "ultimaker2_0.25": "ultimaker2_olsson_0.25", @@ -61,6 +62,11 @@ class VersionUpgrade43to44(VersionUpgrade): if parser["metadata"].get("type", "") == "quality_changes": parser["metadata"]["intent_category"] = "default" + if "values" in parser: + # Alternate skin rotation should be translated to top/bottom line directions. + if "skin_alternate_rotation" in parser["values"] and parseBool(parser["values"]["skin_alternate_rotation"]): + parser["skin_angles"] = "[45, 135, 0, 90]" + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ab5a41344a..ca0057adb4 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6441,16 +6441,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "skin_alternate_rotation": - { - "label": "Alternate Skin Rotation", - "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", - "type": "bool", - "default_value": false, - "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, "cross_infill_pocket_size": { "label": "Cross 3D Pocket Size", diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index ad0d2993d2..2b9ad362fc 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -372,7 +372,6 @@ coasting_enable coasting_volume coasting_min_volume coasting_speed -skin_alternate_rotation cross_infill_pocket_size spaghetti_infill_enabled spaghetti_infill_stepped From 227b76d6f0db7d419523254184fa7fc301929829 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 13:51:02 +0200 Subject: [PATCH 712/994] Remove deprecated currentExtruderPositions CURA-6858 --- cura/Settings/ExtruderStack.py | 4 ++++ cura/Settings/MachineManager.py | 7 ------- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index 9983ab6c98..5d4b3e38b1 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -51,6 +51,10 @@ class ExtruderStack(CuraContainerStack): def getNextStack(self) -> Optional["GlobalStack"]: return super().getNextStack() + @pyqtProperty(int, constant = True) + def position(self) -> int: + return int(self.getMetaDataEntry("position")) + def setEnabled(self, enabled: bool) -> None: if self.getMetaDataEntry("enabled", True) == enabled: # No change. return # Don't emit a signal then. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d1f8cad4b3..6ffcf51b6e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1078,13 +1078,6 @@ class MachineManager(QObject): container = extruder.userChanges container.removeInstance(setting_name) - @pyqtProperty("QVariantList", notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2") - def currentExtruderPositions(self) -> List[str]: - if self._global_container_stack is None: - return [] - return sorted(list(self._global_container_stack.extruders.keys())) - ## Update _current_root_material_id when the current root material was changed. def _onRootMaterialChanged(self) -> None: self._current_root_material_id = {} diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index d698c0d3af..dfc6e3a9ca 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -143,27 +143,27 @@ UM.Dialog { width: parent.width height: childrenRect.height - model: Cura.MachineManager.currentExtruderPositions + model: Cura.MachineManager.activeMachine.extruderList delegate: Column { height: childrenRect.height width: parent.width property string variantName: { - var extruder = Cura.MachineManager.activeMachine.extruderList[modelData] + var extruder = modelData var variant_name = extruder.variant.name return (variant_name !== undefined) ? variant_name : "" } property string materialName: { - var extruder = Cura.MachineManager.activeMachine.extruderList[modelData] + var extruder = modelData var material_name = extruder.material.name return (material_name !== undefined) ? material_name : "" } Label { text: { - var extruder = Number(modelData) + var extruder = Number(modelData.position) var extruder_id = "" if(!isNaN(extruder)) { @@ -171,7 +171,7 @@ UM.Dialog } else { - extruder_id = modelData + extruder_id = modelData.position } return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id) From 43ee68bdc7ed3612f88ae134a43138b3e304395e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 13:57:18 +0200 Subject: [PATCH 713/994] Remove deprecated PrinterOutputDevice.setAcceptsCommands CURA-6858 --- cura/PrinterOutput/PrinterOutputDevice.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index 980ee7864d..ae916e434b 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -10,7 +10,6 @@ from UM.Logger import Logger from UM.Signal import signalemitter from UM.Qt.QtApplication import QtApplication from UM.FlameProfiler import pyqtSlot -from UM.Decorators import deprecated from UM.i18n import i18nCatalog from UM.OutputDevice.OutputDevice import OutputDevice @@ -203,10 +202,6 @@ class PrinterOutputDevice(QObject, OutputDevice): def acceptsCommands(self) -> bool: return self._accepts_commands - @deprecated("Please use the protected function instead", "3.2") - def setAcceptsCommands(self, accepts_commands: bool) -> None: - self._setAcceptsCommands(accepts_commands) - ## Set a flag to signal the UI that the printer is not (yet) ready to receive commands def _setAcceptsCommands(self, accepts_commands: bool) -> None: if self._accepts_commands != accepts_commands: From 9c92e61699375f40b9dd60eb36d5258c032494aa Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 13:58:31 +0200 Subject: [PATCH 714/994] Remove deprecated getChildNode and getContainer in ContainerNode CURA-6858 --- cura/Machines/ContainerNode.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 3e8d3da7da..a8bbf0a537 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -7,7 +7,7 @@ from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Logger import Logger from UM.Settings.InstanceContainer import InstanceContainer -from UM.Decorators import deprecated + ## A node in the container tree. It represents one container. # @@ -43,18 +43,6 @@ class ContainerNode: return default return container_metadata[0].get(entry, default) - ## Get the child with the specified container ID. - # \param child_id The container ID to get from among the children. - # \return The child node, or ``None`` if no child is present with the - # specified ID. - @deprecated("Iterate over the children instead of requesting them one by one.", "4.3") - def getChildNode(self, child_id: str) -> Optional["ContainerNode"]: - return self.children_map.get(child_id) - - @deprecated("Use `.container` instead.", "4.3") - def getContainer(self) -> Optional[InstanceContainer]: - return self.container - ## The container that this node's container ID refers to. # # This can be used to finally instantiate the container in order to put it From 7544d049c5d19a53563c9d2192dbe7173acefba1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 13:59:27 +0200 Subject: [PATCH 715/994] Remove deprecated ExtruderManager.getExtruderName CURA-6858 --- cura/Settings/ExtruderManager.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 417f7b01ff..c077f2f63f 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -91,17 +91,6 @@ class ExtruderManager(QObject): def activeExtruderIndex(self) -> int: return self._active_extruder_index - ## Gets the extruder name of an extruder of the currently active machine. - # - # \param index The index of the extruder whose name to get. - @pyqtSlot(int, result = str) - @deprecated("Use Cura.MachineManager.activeMachine.extruders[index].name instead", "4.3") - def getExtruderName(self, index: int) -> str: - try: - return self.getActiveExtruderStacks()[index].getName() - except IndexError: - return "" - ## Emitted whenever the selectedObjectExtruders property changes. selectedObjectExtrudersChanged = pyqtSignal() From 38ee4bf20898fd321ba726694d3dfb82050a027a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 13:18:01 +0200 Subject: [PATCH 716/994] Remove deprecated functions in MachineManager CURA-6858 --- cura/Settings/MachineManager.py | 130 +----------------- .../MachineSettingsExtruderTab.qml | 2 +- .../MachineSettingsPrinterTab.qml | 2 +- plugins/MonitorStage/MonitorMain.qml | 2 +- .../PrintHeadMinMaxTextField.qml | 2 +- .../ConfigurationMenu/ConfigurationMenu.qml | 8 +- .../ConfigurationMenu/CustomConfiguration.qml | 4 +- resources/qml/Menus/SettingsMenu.qml | 8 +- resources/qml/Preferences/MachinesPage.qml | 2 +- .../Preferences/Materials/MaterialsPage.qml | 4 +- .../Preferences/Materials/MaterialsView.qml | 2 +- resources/qml/Preferences/ProfilesPage.qml | 2 +- .../PrinterSelector/MachineSelectorList.qml | 2 +- resources/qml/Settings/SettingItem.qml | 2 +- tests/TestMachineManager.py | 25 ---- 15 files changed, 27 insertions(+), 170 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 6ffcf51b6e..024ed3379d 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -447,27 +447,6 @@ class MachineManager(QObject): def stacksHaveErrors(self) -> bool: return bool(self._stacks_have_errors) - @pyqtProperty(str, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.definition.name instead", "4.1") - def activeMachineDefinitionName(self) -> str: - if self._global_container_stack: - return self._global_container_stack.definition.getName() - return "" - - @pyqtProperty(str, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.name instead", "4.1") - def activeMachineName(self) -> str: - if self._global_container_stack: - return self._global_container_stack.getMetaDataEntry("group_name", self._global_container_stack.getName()) - return "" - - @pyqtProperty(str, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.id instead", "4.1") - def activeMachineId(self) -> str: - if self._global_container_stack: - return self._global_container_stack.getId() - return "" - @pyqtProperty(str, notify = globalContainerChanged) def activeMachineFirmwareVersion(self) -> str: if not self._printer_output_devices: @@ -496,13 +475,6 @@ class MachineManager(QObject): return has_remote_connection return False - @pyqtProperty("QVariantList", notify=globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.configuredConnectionTypes instead", "4.1") - def activeMachineConfiguredConnectionTypes(self): - if self._global_container_stack: - return self._global_container_stack.configuredConnectionTypes - return [] - @pyqtProperty(bool, notify = printerConnectedStatusChanged) def activeMachineIsGroup(self) -> bool: return bool(self._printer_output_devices) and len(self._printer_output_devices[0].printers) > 1 @@ -554,24 +526,6 @@ class MachineManager(QObject): return material.getId() return "" - ## Gets a dict with the active materials ids set in all extruder stacks and the global stack - # (when there is one extruder, the material is set in the global stack) - # - # \return The material ids in all stacks - @pyqtProperty("QVariantMap", notify = activeMaterialChanged) - @deprecated("use Cura.MachineManager.activeStack.extruders instead.", "4.3") - def allActiveMaterialIds(self) -> Dict[str, str]: - result = {} - - active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() - for stack in active_stacks: - material_container = stack.material - if not material_container: - continue - result[stack.getId()] = material_container.getId() - - return result - ## Gets the layer height of the currently active quality profile. # # This is indicated together with the name of the active quality profile. @@ -693,44 +647,6 @@ class MachineManager(QObject): # Check if the value has to be replaced extruder_stack.userChanges.setProperty(key, "value", new_value) - @pyqtProperty(str, notify = activeVariantChanged) - @deprecated("use Cura.MachineManager.activeStack.variant.name instead", "4.1") - def activeVariantName(self) -> str: - if self._active_container_stack: - variant = self._active_container_stack.variant - if variant: - return variant.getName() - - return "" - - @pyqtProperty(str, notify = activeVariantChanged) - @deprecated("use Cura.MachineManager.activeStack.variant.id instead", "4.1") - def activeVariantId(self) -> str: - if self._active_container_stack: - variant = self._active_container_stack.variant - if variant: - return variant.getId() - - return "" - - @pyqtProperty(str, notify = activeVariantChanged) - @deprecated("use Cura.MachineManager.activeMachine.variant.name instead", "4.1") - def activeVariantBuildplateName(self) -> str: - if self._global_container_stack: - variant = self._global_container_stack.variant - if variant: - return variant.getName() - - return "" - - @pyqtProperty(str, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.definition.id instead", "4.1") - def activeDefinitionId(self) -> str: - if self._global_container_stack: - return self._global_container_stack.definition.id - - return "" - ## Get the Definition ID to use to select quality profiles for the currently active machine # \returns DefinitionID (string) if found, empty string otherwise @pyqtProperty(str, notify = globalContainerChanged) @@ -788,27 +704,6 @@ class MachineManager(QObject): # This reuses the method and remove all printers recursively self.removeMachine(hidden_containers[0].getId()) - @pyqtProperty(bool, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.hasMaterials instead", "4.2") - def hasMaterials(self) -> bool: - if self._global_container_stack: - return self._global_container_stack.hasMaterials - return False - - @pyqtProperty(bool, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.hasVariants instead", "4.2") - def hasVariants(self) -> bool: - if self._global_container_stack: - return self._global_container_stack.hasVariants - return False - - @pyqtProperty(bool, notify = globalContainerChanged) - @deprecated("use Cura.MachineManager.activeMachine.hasVariantBuildplates instead", "4.2") - def hasVariantBuildplates(self) -> bool: - if self._global_container_stack: - return self._global_container_stack.hasVariantBuildplates - return False - ## The selected buildplate is compatible if it is compatible with all the materials in all the extruders @pyqtProperty(bool, notify = activeMaterialChanged) def variantBuildplateCompatible(self) -> bool: @@ -823,7 +718,8 @@ class MachineManager(QObject): if material_container == empty_material_container: continue if material_container.getMetaDataEntry("buildplate_compatible"): - buildplate_compatible = buildplate_compatible and material_container.getMetaDataEntry("buildplate_compatible")[self.activeVariantBuildplateName] + active_buildplate_name = self.activeMachine.variant.name + buildplate_compatible = buildplate_compatible and material_container.getMetaDataEntry("buildplate_compatible")[active_buildplate_name] return buildplate_compatible @@ -946,7 +842,7 @@ class MachineManager(QObject): if settable_per_extruder: limit_to_extruder = int(self._global_container_stack.getProperty(setting_key, "limit_to_extruder")) extruder_position = max(0, limit_to_extruder) - extruder_stack = self.getExtruder(extruder_position) + extruder_stack = self._global_container_stack.extruderList[extruder_position] if extruder_stack: extruder_stack.userChanges.setProperty(setting_key, "value", global_user_container.getProperty(setting_key, "value")) else: @@ -957,20 +853,6 @@ class MachineManager(QObject): self._application.globalContainerStackChanged.emit() self.forceUpdateAllSettings() - @pyqtSlot(int, result = QObject) - def getExtruder(self, position: int) -> Optional[ExtruderStack]: - return self._getExtruder(position) - - # This is a workaround for the deprecated decorator and the pyqtSlot not playing well together. - @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2") - def _getExtruder(self, position) -> Optional[ExtruderStack]: - if self._global_container_stack: - try: - return self._global_container_stack.extruderList[int(position)] - except IndexError: - return None - return None - def updateDefaultExtruder(self) -> None: if self._global_container_stack is None: return @@ -1021,10 +903,10 @@ class MachineManager(QObject): @pyqtSlot(int, bool) def setExtruderEnabled(self, position: int, enabled: bool) -> None: - extruder = self.getExtruder(position) - if not extruder or self._global_container_stack is None: + if self._global_container_stack is None: Logger.log("w", "Could not find extruder on position %s", position) return + extruder = self._global_container_stack.extruderList[position] extruder.setEnabled(enabled) self.updateDefaultExtruder() @@ -1356,7 +1238,7 @@ class MachineManager(QObject): @pyqtSlot(str) def switchPrinterType(self, machine_name: str) -> None: # Don't switch if the user tries to change to the same type of printer - if self._global_container_stack is None or self.activeMachineDefinitionName == machine_name: + if self._global_container_stack is None or self._global_container_stack.definition.name == machine_name: return Logger.log("i", "Attempting to switch the printer type to [%s]", machine_name) # Get the definition id corresponding to this machine name diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index 5ba331de2b..2ceabf87d0 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -68,7 +68,7 @@ Item Cura.NumericTextFieldWithUnit // "Nozzle size" { id: extruderNozzleSizeField - visible: !Cura.MachineManager.hasVariants + visible: !Cura.MachineManager.activeMachine.hasVariants containerStackId: base.extruderStackId settingKey: "machine_nozzle_size" settingStoreIndex: propertyStoreIndex diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index b8c6b78004..21d2f978cb 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -25,7 +25,7 @@ Item property int controlWidth: (columnWidth / 3) | 0 property var labelFont: UM.Theme.getFont("default") - property string machineStackId: Cura.MachineManager.activeMachineId + property string machineStackId: Cura.MachineManager.activeMachine.id property var forceUpdateFunction: manager.forceUpdate diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 7c0a20ef66..a70c10ff0f 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -25,7 +25,7 @@ Rectangle { // Readability: var connectedTypes = [2, 3]; - var types = Cura.MachineManager.activeMachineConfiguredConnectionTypes + var types = Cura.MachineManager.activeMachine.configuredConnectionTypes // Check if configured connection types includes either 2 or 3 (LAN or cloud) for (var i = 0; i < types.length; i++) diff --git a/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml b/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml index 7bb5f5fc76..1bbdb3c5c5 100644 --- a/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml +++ b/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml @@ -27,7 +27,7 @@ NumericTextFieldWithUnit id: printerHeadMinMaxField UM.I18nCatalog { id: catalog; name: "cura" } - containerStackId: Cura.MachineManager.activeMachineId + containerStackId: Cura.MachineManager.activeMachine.id settingKey: "machine_head_with_fans_polygon" settingStoreIndex: 1 diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 959d498054..9e4a0b81e4 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -32,7 +32,7 @@ Cura.ExpandablePopup } contentPadding: UM.Theme.getSize("default_lining").width - enabled: Cura.MachineManager.hasMaterials || Cura.MachineManager.hasVariants || Cura.MachineManager.hasVariantBuildplates; //Only let it drop down if there is any configuration that you could change. + enabled: Cura.MachineManager.activeMachine.hasMaterials || Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasVariantBuildplates; //Only let it drop down if there is any configuration that you could change. headerItem: Item { @@ -44,7 +44,7 @@ Cura.ExpandablePopup orientation: ListView.Horizontal anchors.fill: parent model: extrudersModel - visible: Cura.MachineManager.hasMaterials + visible: Cura.MachineManager.activeMachine.hasMaterials delegate: Item { @@ -86,7 +86,7 @@ Cura.ExpandablePopup { id: variantLabel - visible: Cura.MachineManager.hasVariants + visible: Cura.MachineManager.activeMachine.hasVariants text: model.variant elide: Text.ElideRight @@ -115,7 +115,7 @@ Cura.ExpandablePopup color: UM.Theme.getColor("text") renderType: Text.NativeRendering - visible: !Cura.MachineManager.hasMaterials && (Cura.MachineManager.hasVariants || Cura.MachineManager.hasVariantBuildplates) + visible: !Cura.MachineManager.activeMachine.hasMaterials && (Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasVariantBuildplates) anchors { diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index fda9ee35ac..65f5bcce8c 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -244,7 +244,7 @@ Item Row { height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0 - visible: Cura.MachineManager.hasMaterials + visible: Cura.MachineManager.activeMachine.hasMaterials Label { @@ -305,7 +305,7 @@ Item Row { height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0 - visible: Cura.MachineManager.hasVariants + visible: Cura.MachineManager.activeMachine.hasVariants Label { diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 17a4f6734a..0afbccd5ca 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -22,13 +22,13 @@ Menu Menu { title: modelData.name - property var extruder: Cura.MachineManager.getExtruder(model.index) - NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index } - MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index } + property var extruder: Cura.MachineManager.activeMachine.extruderList[model.index] + NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.activeMachine.hasVariants; extruderIndex: index } + MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.activeMachine.hasMaterials; extruderIndex: index } MenuSeparator { - visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials + visible: Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasMaterials } MenuItem diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 594cdbebf3..39789cd192 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -84,7 +84,7 @@ UM.ManagementPage Flow { id: machineActions - visible: currentItem && currentItem.id == Cura.MachineManager.activeMachineId + visible: currentItem && currentItem.id == Cura.MachineManager.activeMachine.id anchors.left: parent.left anchors.right: parent.right anchors.top: machineName.bottom diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 32c4773640..fcfe5749e0 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -103,7 +103,7 @@ Item id: activateMenuButton text: catalog.i18nc("@action:button", "Activate") iconName: "list-activate" - enabled: !isCurrentItemActivated && Cura.MachineManager.hasMaterials + enabled: !isCurrentItemActivated && Cura.MachineManager.activeMachine.hasMaterials onClicked: { forceActiveFocus() @@ -227,7 +227,7 @@ Item text: { var caption = catalog.i18nc("@action:label", "Printer") + ": " + Cura.MachineManager.activeMachine.name; - if (Cura.MachineManager.hasVariants) + if (Cura.MachineManager.activeMachine.hasVariants) { var activeVariantName = "" if(Cura.MachineManager.activeStack != null) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 8a5ec79d53..f781497081 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -449,7 +449,7 @@ TabView UM.ContainerPropertyProvider { id: variantPropertyProvider - containerId: Cura.MachineManager.activeVariantId + containerId: Cura.MachineManager.activeStack.variant.id watchedProperties: [ "value" ] key: model.key } diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index dc7c3d109f..fdb961ad21 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -393,7 +393,7 @@ Item left: parent.left } visible: text != "" - text: catalog.i18nc("@label %1 is printer name", "Printer: %1").arg(Cura.MachineManager.activeMachineName) + text: catalog.i18nc("@label %1 is printer name", "Printer: %1").arg(Cura.MachineManager.activeMachine.name) width: profileScrollView.width elide: Text.ElideRight } diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml index 9c52c15580..a7c041630f 100644 --- a/resources/qml/PrinterSelector/MachineSelectorList.qml +++ b/resources/qml/PrinterSelector/MachineSelectorList.qml @@ -32,7 +32,7 @@ ListView width: listView.width outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null - checked: Cura.MachineManager.activeMachineId == model.id + checked: Cura.MachineManager.activeMachine.id == model.id onClicked: { diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 04b601f983..c851b7c042 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -33,7 +33,7 @@ Item // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) property var state: propertyProvider.properties.state // There is no resolve property if there is only one stack. - property var resolve: Cura.MachineManager.activeStackId !== Cura.MachineManager.activeMachineId ? propertyProvider.properties.resolve : "None" + property var resolve: Cura.MachineManager.activeStackId !== Cura.MachineManager.activeMachine.id ? propertyProvider.properties.resolve : "None" property var stackLevels: propertyProvider.stackLevels property var stackLevel: stackLevels[0] // A list of stack levels that will trigger to show the revert button diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py index 96c0bc1bec..a5d9d314cd 100644 --- a/tests/TestMachineManager.py +++ b/tests/TestMachineManager.py @@ -90,37 +90,12 @@ def createMockedInstanceContainer(instance_id, name = ""): return instance -def test_allActiveMaterialIds(machine_manager, extruder_manager): - extruder_1 = createMockedExtruder("extruder_1") - extruder_2 = createMockedExtruder("extruder_2") - extruder_1.material = createMockedInstanceContainer("material_1") - extruder_2.material = createMockedInstanceContainer("material_2") - extruder_manager.getActiveExtruderStacks = MagicMock(return_value = [extruder_1, extruder_2]) - assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"} - - def test_globalVariantName(machine_manager, application): global_stack = application.getGlobalContainerStack() global_stack.variant = createMockedInstanceContainer("beep", "zomg") assert machine_manager.globalVariantName == "zomg" -def test_activeMachineDefinitionName(machine_manager): - global_stack = machine_manager.activeMachine - global_stack.definition = createMockedInstanceContainer("beep", "zomg") - assert machine_manager.activeMachineDefinitionName == "zomg" - - -def test_activeMachineId(machine_manager): - assert machine_manager.activeMachineId == "GlobalStack" - - -def test_activeVariantBuildplateName(machine_manager): - global_stack = machine_manager.activeMachine - global_stack.variant = createMockedInstanceContainer("beep", "zomg") - assert machine_manager.activeVariantBuildplateName == "zomg" - - def test_resetSettingForAllExtruders(machine_manager): global_stack = machine_manager.activeMachine extruder_1 = createMockedExtruder("extruder_1") From 1f3a7c976fc875e6dc8a68a04a824a23f5640c39 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 14:09:43 +0200 Subject: [PATCH 717/994] Remove deprecated MachineManager.activeMachineHasRemoteConnection CURA-6858 --- cura/Settings/GlobalStack.py | 14 ++++++++++++++ cura/Settings/MachineManager.py | 12 ------------ .../Menus/ConfigurationMenu/ConfigurationMenu.qml | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 17daaf205a..e020467a54 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -20,6 +20,7 @@ from UM.Platform import Platform from UM.Util import parseBool import cura.CuraApplication +from cura.PrinterOutput.PrinterOutputDevice import ConnectionType from . import Exceptions from .CuraContainerStack import CuraContainerStack @@ -108,6 +109,19 @@ class GlobalStack(CuraContainerStack): pass return result + # Returns a boolean indicating if this machine has a remote connection. A machine is considered as remotely + # connected if its connection types contain one of the following values: + # - ConnectionType.NetworkConnection + # - ConnectionType.CloudConnection + @pyqtProperty(bool, notify = configuredConnectionTypesChanged) + def hasRemoteConnection(self) -> bool: + has_remote_connection = False + + for connection_type in self.configuredConnectionTypes: + has_remote_connection |= connection_type in [ConnectionType.NetworkConnection.value, + ConnectionType.CloudConnection.value] + return has_remote_connection + ## \sa configuredConnectionTypes def addConfiguredConnectionType(self, connection_type: int) -> None: configured_connection_types = self.configuredConnectionTypes diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 024ed3379d..396dd2f32f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -463,18 +463,6 @@ class MachineManager(QObject): def printerConnected(self) -> bool: return bool(self._printer_output_devices) - @pyqtProperty(bool, notify = printerConnectedStatusChanged) - @deprecated("use Cura.MachineManager.activeMachine.configuredConnectionTypes instead", "4.2") - def activeMachineHasRemoteConnection(self) -> bool: - if self._global_container_stack: - has_remote_connection = False - - for connection_type in self._global_container_stack.configuredConnectionTypes: - has_remote_connection |= connection_type in [ConnectionType.NetworkConnection.value, - ConnectionType.CloudConnection.value] - return has_remote_connection - return False - @pyqtProperty(bool, notify = printerConnectedStatusChanged) def activeMachineIsGroup(self) -> bool: return bool(self._printer_output_devices) and len(self._printer_output_devices[0].printers) > 1 diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 9e4a0b81e4..f0ada92810 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -140,7 +140,7 @@ Cura.ExpandablePopup onVisibleChanged: { - is_connected = Cura.MachineManager.activeMachineHasRemoteConnection && Cura.MachineManager.printerConnected && Cura.MachineManager.printerOutputDevices[0].uniqueConfigurations.length > 0 //Re-evaluate. + is_connected = Cura.MachineManager.activeMachine.hasRemoteConnection && Cura.MachineManager.printerConnected && Cura.MachineManager.printerOutputDevices[0].uniqueConfigurations.length > 0 //Re-evaluate. // If the printer is not connected or does not have configurations, we switch always to the custom mode. If is connected instead, the auto mode // or the previous state is selected From b6d591c64c6241db7c91884dd46eaca23cdbd5f9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 14:01:43 +0200 Subject: [PATCH 718/994] Add typing CURA-6858 --- cura/Settings/GlobalStack.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index e020467a54..d3a8842aa3 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -287,15 +287,15 @@ class GlobalStack(CuraContainerStack): def getHeadAndFansCoordinates(self): return self.getProperty("machine_head_with_fans_polygon", "value") - @pyqtProperty(int, constant=True) - def hasMaterials(self): + @pyqtProperty(bool, constant = True) + def hasMaterials(self) -> bool: return parseBool(self.getMetaDataEntry("has_materials", False)) - @pyqtProperty(int, constant=True) - def hasVariants(self): + @pyqtProperty(bool, constant = True) + def hasVariants(self) -> bool: return parseBool(self.getMetaDataEntry("has_variants", False)) - @pyqtProperty(int, constant=True) + @pyqtProperty(bool, constant = True) def hasVariantBuildplates(self) -> bool: return parseBool(self.getMetaDataEntry("has_variant_buildplates", False)) From a34389ca782ca849e7d96929bf6d2458b94478cd Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 14:36:17 +0200 Subject: [PATCH 719/994] Add files via upload --- .../definitions/leapfrog_bolt_pro.def.json | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 resources/definitions/leapfrog_bolt_pro.def.json diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json new file mode 100644 index 0000000000..4265993222 --- /dev/null +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -0,0 +1,131 @@ + { + "version": 2, + "name": "Leapfrog Bolt Pro", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Karan and Vincent 20191022", + "manufacturer": "Leapfrog B.V.", + "category": "Other", + "platform": "leapfrog_bolt_pro_platform.stl", + "platform_offset": [0, 0, -14], + "file_formats": "text/x-gcode", + "supports_usb_connection": false, + "supports_network_connection": false, + "has_materials": true, + "preferred_material": "leapfrog", + "has_machine_quality": true, + "has_variants": true, + "preferred_variant_name": "Brass 0.4", + "preferred_material": "leapfrog_epla_natural", + "variants_name": "Hot end", + "exclude_materials": [ + "generic_pla", + "generic_pla_175", + "generic_abs", + "generic_abs_175", + "generic_bam", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pva", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + + "machine_extruder_trains": + { + "0": "leapfrog_bolt_pro_extruder_right", + "1": "leapfrog_bolt_pro_extruder_left" + } + }, + "overrides": { + "machine_name": {"default_value": "Leapfrog Bolt Pro" }, + "machine_extruder_count": {"default_value": 2}, + "machine_center_is_zero": {"default_value": false}, + "machine_width": {"default_value": 302}, + "machine_height": {"default_value": 205}, + "machine_depth": {"default_value": 322}, + "machine_heated_bed": {"default_value": true}, + "machine_head_with_fans_polygon": {"default_value": [[-1, 1 ], [1, 1], [1, -1 ], [-1, -1]]}, + "machine_max_feedrate_z": {"default_value": 16.7 }, + "machine_max_feedrate_e": {"default_value": 50 }, + "machine_max_acceleration_z": {"default_value": 100 }, + "machine_acceleration": {"default_value": 400 }, + "machine_max_jerk_xy": {"default_value": 20 }, + "machine_max_jerk_z": {"default_value": 0.4 }, + "machine_max_jerk_e": {"default_value": 5 }, + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "material_final_print_temperature": {"value": "default_material_print_temperature" }, + "material_initial_print_temperature": {"value": "default_material_print_temperature" }, + "gantry_height": {"value": "60"}, + "retraction_combing": { "default_value": "all" }, + "retraction_amount": {"default_value": 2}, + "adhesion_type": {"default_value": "skirt"}, + "skirt_line_count": {"default_value": 3}, + "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, + "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, + "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, + "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, + "prime_tower_circular": {"default_value": false}, + "prime_tower_position_x": {"value": "169"}, + "prime_tower_position_y": {"value": "25"}, + "speed_travel": { "value": "200"}, + "build_volume_temperature": {"enabled": false}, + "material_standby_temperature": {"enabled": false } + } +} \ No newline at end of file From 23a9c36f6dd8220fe1c8db7132f4a78362548c81 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 14:40:11 +0200 Subject: [PATCH 720/994] Add files via upload --- .../leapfrog_bolt_pro_extruder_left.def.json | 23 +++++++++++++++++++ .../leapfrog_bolt_pro_extruder_right.def.json | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 resources/extruders/leapfrog_bolt_pro_extruder_left.def.json create mode 100644 resources/extruders/leapfrog_bolt_pro_extruder_right.def.json diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json new file mode 100644 index 0000000000..f4ea1729fb --- /dev/null +++ b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json @@ -0,0 +1,23 @@ +{ + "id": "leapfrog_bolt_pro_extruder_left", + "version": 2, + "name": "Left extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "leapfrog_bolt_pro", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_head_distance": { "default_value": 22 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X6 F1000\nG1 X-32 F4000\nG1 X6"} + } +} \ No newline at end of file diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json new file mode 100644 index 0000000000..2a6662ab2f --- /dev/null +++ b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json @@ -0,0 +1,23 @@ +{ + "id": "leapfrog_bolt_pro_extruder_right", + "version": 2, + "name": "Right extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "leapfrog_bolt_pro", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_head_distance": { "default_value": 22 }, + "machine_nozzle_offset_x": { "default_value": 0}, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X296 F1000\nG1 X334 F4000\nG1 X296"} + } +} \ No newline at end of file From ca39dae9480d4fc5a7da490a573159d4dfa9473b Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 14:44:58 +0200 Subject: [PATCH 721/994] Add files via upload --- .../meshes/leapfrog_bolt_pro_platform.stl | Bin 0 -> 1532634 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/meshes/leapfrog_bolt_pro_platform.stl diff --git a/resources/meshes/leapfrog_bolt_pro_platform.stl b/resources/meshes/leapfrog_bolt_pro_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..be006a5ee3be777679a4d0286c1c900b7012f90b GIT binary patch literal 1532634 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 z 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

xtss!8HhUr?{zi4B6 z4q(@Z#ioi0z0vE}1r(ZJNYH1i7TjIFcBYnjn7tp`Gu!G{+7394kBl(ly~M9V(&#!v z?AA{DzrGCUSdq)H31$3FoE!KGqXL+DRTkDEGkMv?J<_9P(_0YJ*95f}Ie$ zILA)E-|xLVE;>*pm;@3=oSk@CdaAZyvkBGA4xPvvbuCYsmK+jH3!WC+-fW`2M)4Ts zfZN|{WMJp7V7kPQ$?3M_N3?BP{+Mh2xS+1G#NB|X4M;F8c$(^KroX;X*j@SI;-M-5 z+nf3Chu(ML|J!<1XspjUDFUp|>6FMlgb|JyE{4v{=O>v#2 zzfrod*lrx%n}8CSt`U2^z9>05(=lqwlFz2VgJw&|C((HbrUmzI+j$K!9qrOXsgmuk z5^Pr&rt6Q{9_!G4HT4eV1C;#1*=os|1QKLTzuXmRnky~2Wv<1f#En*pJ>IRh2PBvl z+bdBR+BNlJtjqE=LS*Vj5OFQ9iII4AHuR1k>`z%zM6i zY%$Gjc}#9_D^w+z1g2{wyJqL5=dRSpeiUh-KfUF&_{PKPyO3a7(8pdsUT^B{7>v9R zJtgHZV#_B_e6j{@DI-pH^u!N5>At)_W@lzH=FHbmd)5j4eyFsXD<+@h@ym6~f6x_St6y19L>qB$TohlbWj)2rPE+c(SJbb*QONB7 z#Y#XMEM1tA{p_lyw@rkkQ>65^HW&fzgfz5}asaNjFG*|4DCrsCfWfC!h$&Co)j>eD{x}l^u z&3M#Z-RESn1jY|qa_t=H`qb>C2ZV@qZbN>54xzJT>yUuC zCFf*FiOINLFOmEzo~@U_{TBLnZLNmtPE*F7e?o2#p#Pu*u7t4N0jf1k2}yNrj=B~; zObKmwfj(<%CvY#sN))P?FEQVb$U|^d&6ehV-LK65KE=D*=}zPn9kXFeYwKlJ8}5fc zk(#Cd7(t(z7AzkvM^;KXuPJptdD*7Rastl*X|=1_fM-e|!6Nv75ljo7NTI~iKaY{t zqyOM}7_yR@d;SKl0g#hUYMW~W)S_=i);D@c*yakJJc6qRY?Z>6V524f?##{?+2)E# zc!Is%+uC3fe${}b^j|h$$ytrq+JGfzrG;mIsEr`|KYyO(gcA5p4&T*nZLm{XPz&~d zTY|+Bo?vSZ|3xq@IOCwi)ALn-o`-`HxZ(lZ#@2?mE=IkQopgfn%9dd9iYHk4C^7$% zcJ>_B2~V&(r0p^1UfkjI!}-(*r$ro^D=n(=(T>_E^s>yM#+J3@{2+@_ycS%6)XL#d z-cgM{+6tsC!D@sO1LvRlc|H-Q1y=|EtFG9ICVqa!;)<3lt)DXqPq4URORzm5c*+LG zN{xug>_~pi!FI#oP7|#|7V{}_-M(c)gOOQHp~RM8wkdJq_3Q-SDqX#(mUhYl+Jh;n zr@WQ*mF#_HmfGe638)44imk+sn2X;2ZYhaSi`vlkv-1+xnx+4RCpP#s0PXw?)v}JY z_t#V>D@u7d$_HL~y6rwKL>huJvZ75 zN+3a>wH;-vjf8C-$yiSR!8s>?DvX^@(#r8Gf@#57tu4XkyYSQ#s|A{}wRSZdkkD$E z=9aAi*%Iu1fPX({D+rXh(|vAkuZ0BDf^U$vHrR>>JT(XFkP@}^Cv(ShXoH=ggEdWw zzZSXYjyNzfu=jKLc29}aDGPGT0doc4gqb}xSAivSbHya^4I7?3q=dCC=zpPvC)nG) zEdk5HRzKjIo-F~j*qV$jA+B2Kt$7JMTgk5)uzI65wjz(*+Jywug6Ax4bH&b9@~a=L ze6|GJiGzD-aGmQK>IpAtGB$)00vcb}Y?>m(E`}Mk9FJbRa{F*-7 zb)ciO;q2VpTxlaG^%%B#4r_th_ZZ%SZZM?uk$MZb%8ohr7x6 zME}9_qEHLI3ESF$YoY9I8?KAm5^%khtq8-jinaty7usXxvn7}WuIa)xWLrWzTS;pH z=8Bz~v?X9UAkA!3B7K8Cx6N5vyp8`IshR)4U6TKrEy0;3-2Y(yMswwc@8vEJxpr!9n?r(W!B|2ggTs8b&cOT!_B-3Uvi4YOuVwFj{3<7V7o|2J z!RmycA+t#RgRIB2KEA>y;g36sgMNhLIzJvu(;JS)>%N8KGjkm9h`&eT>EFZg>?8T{ zyp8m3s-@)a_ERf5n_W$V%`e}D6s$(r2^EVefy+!$9L<7WrpM4 z1>Z@-!zSZ0pTcpYVlSlfP7^UtY$wE>fF+6d$MxWBKrKjnC3V9_PO#8Rh5Mhmq2f}gV zTA!pE1*0%*Cvvv7O*9Iubl+0lr@R5yJI&Rx>W`(1kH^~hRr1_n=wOYj^6K}Ulc1MC zqVjCw)9=!yF{|irbK1Nbhg$tRUw*Ulp#>693$~^pgiMS?`6qq0oGvjzhLT!?!|~`+ zucT5BLojSja)WY@2vmLQXoIWQHksx`Yg?!l?-!0gx&M&tgQ=G!j1NauL&L>ym*>j1 zEvV6zNI8Uc`EkK-^k%&C+eV`~)8oYP;MAt?DvjQCR8!?hsPimeuo_fE9Kr{2-u|0J46qFzHL$_I>VMA(9`o&PBxj=euW zlZsZSy>?*P;V3I8PA;0ZoFkx?{lakEX;Fq$*@>R(E88d%{oP@_TzP>rM?fvu{^Ydg z;6U_Ic`sKR`9udL&u@ic_XQ86puVFqY=80CjJ znf`L2M8qJpZrOf0_4ICzfLhRF1fj~Te&|fq`f~FLb_(w~c0b!iZWQ(k|Qdb!a)Sgd?2w4~yzq}By%asKlVZA$`7ds20?!y;x1k{3kg^bS6jOgulH`M6cXc2ll^zhO< z!^r7tM_l9rjiTL;cSD1kIiYK43`amM*bB(lxt?QG-0hQS`F@@2ACQ23g`7e%v_`LU z4x3{;RYlO-p@+N84a0s3nbMwN)Z5#X=z`*FI>=XjJUIetK|dCR;AU-6=o@$CfV_zF zMCh;3$H?vYnWfR;>KXE|IyDs-YoTYHJ3I;(a(pedbEZ+W%E&sXvHNP-eoZ}&fLhRF z1mX3(MyS(~?&2Sp8!FHnpqIcHOukF@x*EE8#uN2R|0+Yzc)e{De&gYYXWtrzVfz!m zs$LB(O=+w&OkOL(62g+dA+$06fpprL{$iwcJ5S`%v7>U(!^ja(>nthxlgjs{&Y$Rw zSw^8YI^rTKKI;<<&<50k{ZSD9s`N%&*EmRN=;LaE5=fYSgyL@-?nwz_>95HLJk5{3 zH0!C1f9xwm0%}ch9EJB5e;^G^r2X8~-3j@Y?xB2h9mo+-3-)89T`AWz0r{x_{>ED_te~roJ2&e@;hJ01`^Fy)YtvX8a!X*_bfyBM+ zP`tk9Q|ZNG`dhNi^PP}W4Ljw}`1%|HwV;oY?dZACF*P3-%k*&+mQ~dlz>@Gw;_|pac@IcM;#+eM5|qTBCdYvSirT zpw^b}p?GYhGyYhFdSbQb4#?+n2UPLnHjaQ=e5BstmMOlN)f>4_StLUVB!+(t#V5MC zVACf0#?rl)6Z$v0H)`ThnIoVUoYjyMzimE=7orEER`X6+pac@nb3*akco&@7j^1c} zkbIr8#-4u2)T*Wd5>N|{CFHjj;L|V4(PFAGePF*l;?<)s#YJX4M?kF`Zlmzv ziurI>IXZIged>bt+_@r-U!~&+s0C-4%7Kv)I8Ih1Z)W zetBv{Py&hb4x{iD`y8peKyPtrT=KQp>FF)Qu&e-%fLhN;EV*0gi?qg{5+{-z(4cP3 z^gAE=asw$|#C!|q$g!<^as<@k zXBo>5e-`)mTrAhh-wQzrBu+dJ#q~s^B@vWB0?q~m!S%u$aYI@S<>k5( z2udK)fyCYZ2hyefYiR$7@0%sguxq8vc6uyA0&2negCMMJvP={wk5{H2DWiv@{@u2r z_)5!rQpAD?499kI@A=Sn;@1g+Vo>@ja3q7{;H?3nxM;;UQjK6b3!n5dR!lyXe_%^@1{Gw?`;soWH=X8#M zTF^E*kvMOLUU3OhPI$kSVY<*BoNJLURNM+Mm+sS3i4QBHKnWzM4exsyl4D7_`q8`5 zPW`hAND*|k6)1t82vZ`baR;x_jc@Owq!;a{&~zUido8^hKLkThgfwZ7om)-W6$>e+ zpZDSjs0D44HL^;zO<4ic<&3=(6qqiw=Sgh$b;_0&2hthY`$lI>vp>#~r+M)N)Z+Vx zch=wfIUe&ZrhzdE)PntkC(ao+=zG0rB|3GVqIePOm0#yb2bEw9dl96`*Ptq4bNy}G z4Cb=r)Gr{Q7PL)bdqk$LSn@N`_sC$iuF8^im>~y-V%P_vJwa&n^@_=N(oJ#stPqZX zTF^H6>RUe_-Lp1L(Y0gE6qqipUCkbC4`s9ycCn{xuk*GKHZ|~Qj7mQD<_M?-`#kx^ zp;NXg(TUu_a%;T|XJIfJPjAZYXc9<3d*r66Ge-TA zk%Q2Xd!J<}fdro`;hdeJM?f?R&Ax4cxq>-?^EtB4(5I&9ZNNm7@@;}hZPZ`rjGL!M z;&d=?gY!8-DF5T8`D^?X)W}}P5l{=-69mW7`Sm;VkzcD>xN+3aP3#s{Wi*0n)_akzk&h>n#%f6U`pac>$ zx8tv7Nf)Nm`Bj*?y1CzV5AmsSDn~#qI6EUV0L9%fG~$wF(3EJkN0P&{2*g2f?Ci9oNJNae-!&@9&si?PPGe1Pyz|s{*`(?mu8oXBIQWkwoCufF~4$W zt1p5QI9q}#k-HO`q?pIf)GHAs>Z#?ZN5;V)l_y|0ot`c^Sq{urWc`1_g&)1~Fm?7^{}ysJetH#eU=Rq6evklF{e@f?ofJYm1a(eifh z6vgb^oFkwXv?mCsTD&*+)1{lspN>&SPT%$4r772E;d7~Bc>68^AJ}evUfbclG)euQ z-`#Pg4ZaIc8k(+(&O>NgwB(NdFQpwLXOZ@BN^`ahzqCtC-ZWYzGzqn#5%jsrnR`-B zN%}jl$kQYAFKS#AUu_tkhtRaBjq{K1N>0z|FRH#CcQw5`RSV6FMJl05V7injdi%2U zZNfA{tnKP)Ru-Y}q3Zp=nXunY9bz2jl21f}6uy>bn&zskpy3s)Qzi>C)#}8w%oA zO({`mRu6NnqP|LeLB~9VrbTT`ty2_lIZk8y@tHmJ^*jeEfvbPWPy*AX&ntq8;xQE| zQEhe)^W*B#ibIQ!7F$BoqJJ+>ZqR-g^}fpVU>5|_f?D+N#pV>mo%_(4rCX2I2FF8QO5OCvDxparL7#nky5Ob9 z>F<(1R&8ZjZ0DhL(s$28Xj;_9$9wtl!mNRW2rbv$wC2G?aYm1ch^7_X{iW2V)gU#N zj63#Ha@AX(_laMm1q%ldB6!1W-I@kr;^WVG2~CTp6sP|zolF@tTm|nwF0DU47*m4vT6)%JyEiF={d)CXO_SIX8cn|Q^C%ka z=(SY;?w=%;s9yArlpH(&cX%)ux89Z^;mf|NjoTfcNPh*=_8@19(D%lhe3DbQc+;q_ zz1`8AXk!U|W&}A+g?$VBR53OEC@6|I&Z9T3X(Dq7M00*yc}#^@%H8 z%uqs~HDYM>U~K7fQMw;Mf1^lkta$O-D><$8LEBtuQJc~%?o#6Tr>R~U=U@C|OK4h@ z&}v-}Dv-Kbe0{Siwa)KJRHD@heb(xV&s9%yCsm0_`;#`fXXqdSwdmiqcCwb^Z2AiC z?Ea^kQHl2cN}sj9LUXIVi&}}M8EX?##M3IF&D$xV#Y9T5`L1nyKthXfkhaq+tstRP-07H_N)Z`Z}gC2UQ|naC!^0=RD-sygop9p zgrerM&7cGl&>pivpQuEuQThyPT5DM=@w!~rp^4vJ{-Ii$1QOJ?)^C`NgI?WKPlWH8 zT1=$0Rz557rOqw&v>}wxXGmzZz--Vbs-?|q>9aPgq0gGuOwIwSQ>yc1mlrGnkT2p!u_ZJuT5`>{l`#HW(R*T>WYycX zo$?e10@J0>S}l-W%SLIYQkAyJeNrRTu~zGYbVOe7_e4Sy z2CAc)RwhAMye(U&uenH8ydqUXlR$z#YcmctSL)f?e^Xm}t6F95N_#EC)p<$5i;pDX zzz|Hw-Qj1RNT*f=Sw~JKTU>T|=C?}b` zV(v#JKnW!1v)2Ar;`pBax#iHTQ!VX%P$f>ilsu2dfLu|QN+1Etp}n_RZA4x5S0lA8 zp=m*TR$@lYiib2C^VWZsnxqD*ex=PtDWTPfmH4Z1h1_yz5~>9Wt=_Bz{V)ATwYG&j z;^op1)rK|~rGGbmvcq4`Xnqx3U{|gUO+vLGq2-pQJWV+|?}qw2da9*KYzZxgR^q_% ziR!6)sdc0sTr_rLYp0?bC8=7ZRElr3cjeF4a@l8Ei{l zuX}zxt#`CqSK6C5CA2qWtBvJ{59Qi`gr-G_nm?Rzzf{-I-dttN6?03j z<(FzfLd&5wSM#A*yv#ccdY(oNS!S@~V`;VUW(5&K43hH66K*>3h z?wv8$rMBWAbv$QpMctwsD0_b#l|5@zP;F=uNWgboK^Qu4k@&trq+*rK;MG4GxO01>~qcy|320l?KEE?YZ))+=#PAeQD)w(rsw^K5#(FQ zWG3r|Z)~Sy?egubEo*KLSN3d5RoAarT2Lzj?;7la$!81*@giff;d{nlWo2|m9zxTi zwl$w7zs;z=(_AjRk#c`rb9GgXNm#m+V7=D9T4PK2{sxNfmXAs>2_tAZCfs+x-PY25 zgNdu#8uC>?ET3N(mWR-^s0}T~2tq(Tq#yFze);s%aFt*Zm~I3vTJDDw6inA%H@#hI z=`(YKUhWc;hhSO}*!}qjX=q_(Jye28V7d{wx!X;tTt&Ld>H2l4p+Z_Tvdf&Iu6RL0)1o%C znJoE^drxF;y?!hTuKK6QOIW(}?`-xu#dQ?z$%DOi)qonYcp~|xV|=@e4>#TI)A;PN-zl{sEsx!o=QuK(3RAU=ZlK@ zk2s;s=e_d~nijR8&FutX&#_YSrJH|B1O%F?*@ulK)6$ zOWEUj2pHR0%-@hO$1?atv~pw73UUMHXq?nPLz?hMKayWII@4UiHx@xSvoS`w(xktE zmoS2#8PM^$e{hU4-F>kEj(2pdh4$EU;RRtj%lBxdYSclFfH|b2w)RduYs4aGV!^E^D9_dXoEg$GY(n`HY4LD%m)2?0r6ky^gZjhe#!R-dXXFc@2((s zX2P_X7MyWV8-nnL5L?KMiI?yMvmvL&pp=YSCXYQuRYH@%+J&`F?x!Z})H~N~HjR&| zqNiFK0kz;9h0IG{M zq%)bw)<>nVoBkNigWwE@>Q6&a=`{~m%zD@iYSFn*-DSt5kyps-2beigg8U-z#tK6Y zsbQ!^)7553w!}2$eDjv%i_>&76n*q>gM$lZ<5f|mQ z2b1swn{n8d1J;kYElo;&WNjN(SGKu=rLFtH85>5>8jZkJN`8{wy_)^Ac8_}Q%*_?l znzA|{ez=xu*%CACy8pZnfUh5xZUlaq^+ej+RmoU$OGg;c^o9C8SBLlTj!F)k#GS}J%p;xk$sErupm)qtWMijy^cj?{Z zd}PpO12pe^KZnHrE=907jP7Sc+Lq8peX0csR_nGz_wq$?-zjvi#uJUcy5s6YXl`x2 zT^Qz$4|bw&qY>C`fIE)A?W;aN^7g<5%=GWJHXy;YBJeA(qIl3>bZ^_1V3G(7iD!Wx zc%%o-6(zb%?)~!?513X2W?B)LmBZEslkfzq5lXZzw^UshrKN4W+6|9MpgYnLSpQD} zT&yY8VuS(7&JaICt5N`jG)|+jvAi=cA__41r-gC$A7X*_;U`VjGv9$pS zrbSMP~-gaAYAALhWFpIuTM&L68pGgVjw3ztv{n=a_OafaCu2R_6mG%}-(}nH9 zYWly3?FDkAjl*f=BoXe012zrOaz!5HkcN)XKMq-L|D_TMktZ5LU`^B01`~= zze>(lgkT%k)-Lrf>p#9mVgFz$(Oh|NTAf>R*rQl4ioj>zevl5N|7yg61k;MZtfp=2 z3KC2UuAS8Qaa=c<++cq6y^eg@Itb5+yd)j@VVz&GIaLsLoN-C={Y>N4*9vK-ahs!+ zQO_=tw{0ka?*kE-#r$(43+T^XX{4;L(wyuK^90ih!aejCq}16oie6hY-Q4)|OL_C7 zAeCSem@bU@l?v3;m+$h;Qo@CPZvv(TwSw@%DrcpTwbVw3ou$l2KWB-bbO9>CB#?lk z!T1f4`XYw<=<7^+w>nGgQ$%|W80ahHqy(d)=p6gCV}a~+4-uKqJB>M%1TN${k|GZ3u-}s zTiYws#Feh6e;8)z2zbTvnU#bH+rW^ zL(Fu<`RW+aqW`UM<-?o(D#0X>fMb+z?}sgF@0+TWsPCe-AS77S4#EYK&Pba!(UG&{ zW@NfvKT3ICwV_Hd2}~D`wQE1u(%sYRmGqc;3au+hu#qze*BEfb;9pm!>!08Q2*))ui8JfoValApAZqO)9K@S?-b1LHE!uUUV{!Qwb*FiLmxJ zr5cN9o6m_WWUB4GNE}MeMo}9~0tvX5(WBnqiG#Lg$dwld=ONgN2V5@+zU7qA{(Xkr zVsc)Bt(OF0*J~M4kIJ+?JYOMm_b9!*d9^kAFbPaI2v6x?N?g_XTQyp{;BoUYq5tyw~m2J}5d~r$K49tq?NHV^20~I0fw8Pv=T`f=hQ?{zmcF7p7OV@o zV%ha-xml5%{0_3_h!uACzaDMS;q&wxBS=96o}DXw(a`tJz#-a-*g=LBm31K(?Ip=) z=lY{=dUs_Rsy(>=O$vnMie*_Nam?hU9QVoVEA0*cx|5c# z;DZzh$ra1yeUqI%y~|HtRaSPl&&>gl&O6)+Hzg7sqbYrx(CyGEVut=Ea# zX=n)|WK=DdwR2}-g+llY9;z_PckXyoy=Z6-qYX*HdNDq?;c~2f?5VebhJU(KAmrIO zmYv#`nZ0y`5iJ-L`K; z3WVf}WwqA6brz1|r@L(HhT7{C-QcgAF*tHb!4n;x2Un&2!8g#|I-uKz8Eqg!o(E&u zk_``>`LpntOzIBlcNTU`31p2MWFRC3>&4S+?R%Fat2WB7?F-aTfsm)vSoU?#d(J^+ zxpcpO_bTDw%_3UAwY3a{q+q>xc79NJO=P?KaoXPvea1RRgp5+q*&sQt!B5#gW+Gei z?Ir^uDOfK?LY~$iy<;5R?mjW{;pFWrU%?^n_u4!Y(2PJXd23Ctmyb5w`GLmqGzlT@ zo%yK<+YnOVeIiYPHV`4WQr;qqahNF>FG0C&IhN=jab=`FZeRn-9FRA>T%zLKhPS;W z*%J}oi4Ko`dGfwQS7js^k$puPk34dW&oS$c>Ns2;K&!!m$RRq?O@6T zG}nt`3XCl5c(x`^?;NqmVXjMZ;hi^qDda|NyQiE-@2M|!m?;urKCz}MxYyBbQk-6W zTKyCVajrGXaN}<+ZH?~6>0NL6EYihut&}w70KClP%YSgBzQLZ}*bRy{&c-}i7K?L4%WXW{E7ONFko6HN^T|~&6xLDR_Qy5#2g}31- zb=Etv@Kp87YC)SQDOhh`CS%LbYkX-xa;=lr&VJ7rIU*!iEL*ualr4VFWtgS-h{!1V zCUUox2MmOyV7+~rj4hw5Q`eWF+aS&1pQ3W@LxkkQsPna~8|{wL4YW;bKGCcQd7DL1 zsxn#G-6wpU6^#|g>@kpp2)0i$g`RmAuXR3A!GL#9l}*$MWF7= zs1e44K8BD{BaAbA3?X9BpA>VR9N97>WP8?L$q0+NJsCl= zBINlTcQUJVx3k?zcXvoJBjmnfZ3E|A&hy9Y70#fn7vu1}jgd32B;ArB1$Rrd64qX! zW}uGASf&*rDR>Knw>2L_$Xg(cuv!r^T8s6PT}i(A`4~cSVQkroka23P7jJ7mhLHC| z7;m>CWb_>C#aO=;A!GVxguD^@7(#O44TKeedz3tRqxM)4!t>_)uDmy*RRE_u^X@Fq zwRo0Aw6zU+uEmq7718aF@kzI@NHHVKz51$Nw`A*seaDf@Xo9s@@*W3oB0kKE zW`TX@lMu&t9d@){6{lCMaK$&Pc3YO}&k)AjxaMxlT#rH+ulK{OX!bl$7US=fgWPeo zhks{jT2tE#u$o(lte7|j_qxb&H zwiP8j`aV96Q8}3}{b+Wbk7HDBwk~5*d-QjXrq^e!Ry*!Ty|%p~c^UO4Q4nFYLFix` zr7KT#%o>}?|Dl0LJKQ(eMtHecW6pVdzh{bNZ}>O}@tKp4ybjHI`v=!-Q)u3i!slEd z_?&aZIYU;Jl>S<#e~XBE-P9p@D?8&9$?6LdjorvHl~ov0DGevSs0JHu`NgmZKEsaN_if6ZK5*s0NCP1$h;XwFpN6mzKXQck%1CW&lRZ z*PydrTed!52wOsH5Z9)nRHEOg>T&CYKmSpiF%Ge65rONGzEqfQm;b*nqV!o&p?cO- zE|%%oMQ7B6Xtpf9n+?rz$@$+~9%Fa2+a)hLAFk)UdOKr{W5=Ga$p(hw4v9CP1+6hz$Qc7?1@qxl@MAg$`y|6sUY z@3->CIPxtx?7TCVQ{3$Ssl(0-OL*DEUfewFy#0ZfKb-l(pP`6H|7O;7iti!?5pFhh z+hJ#WvSak(kmjSwnd_0Y$IkON=kq}p=jGy2jM03IrL}!((I|$NkG?5O^U*3im#@MlZ|~y&0BY~zc*%M_DsQY>1o;6kmYUmvD^9IBz;~5MweUa2!a%zT=qaw^B-cZ(s1-qo145(Z<^l)?mqR z?U{|!V&fMd4pXFbh4*m=JynLoOCDr)xrd{8>pL2xp713s_B`x9TC2HH? zzDwoOcD@#a|3>NWUmU8;$HBR-k1@A_ZA%0%p~r&l89Q}y8#R=K$g?zi-zj$!aOBu4 zM3Zfwnv;H$JUDXXLNxZ4ZZi_MJNiD3(`)`T!-rNTzH(5aTe=TtzF(r*pdNdiBYxy7 z>Uy1D9CN}w`b$S&A5stz`EN8uSoz!x2U+ov<4ny=YGYgXKIBzO8PfMG|IBAQN+TbW zw`wHz9noe4uUm{9dxB&7--yQ(hweZMBG3ktpV#U`NwQ9=%QCmR(2@a^na&rr`H|g5$`TBl~tlAQ$%57`8F;jGz8w(nLg{M3NC2 zF9m(k-0Xp^t;w4-`-x{(e8=_5K)m2HMLR&58g1zWh+Q;iy}&n z^CAMd&}WprnzJH(Wkets_Lh8~AOE%Yzv0pPtlZ_rU1n~0G<((~H=R<3v-#XIP;Vpp za!o8XD6M1uRgab-@IEqcrf9acdv4kR1~7@}!wgvwBJwJqk5_db+3Vb*UqJ0xzB*D6 zF)yi&tbO_KE(QMuWfk#g&n|nkVRawaP(GqP+tuz&^p;yY z*~aY?O}F8mitU+C6QWnyG7qSNG7)X?(VBb35o8m!%55Cmk%9>G$ln#a7wIL$Ap}y)h_>W$ zG|IryFWw&a?yKn0ulHU`9vPko%qNQx`Ld9O;5*L4Oa;96YttA0i_JF>l7a{qTlz^B zHk0-%`mIK?pa(8TSGP~f=H(+7{tmYv!m}8juQ8iIW8x=$`VPx~9)0}nj=OqR&1gpo zBB~Z>%-dyK`!%tKDyJ=gw2H5`y_)8DTu)KXg>b) zXn(#=j7*dMt&MBAhZ+h%oz!J$p2XOd!hIvcF}*?yv*NBd_*oS`N1gym+rj-PjyC9BOfRG!FkkALZHl*Xf-NVSC! zNHHVgDN=Nwb_qq<-E4tl|BJEy$elcw6VFcO6Vi)H`<)|=wX!j~sCP!ww1Li-_&uka zNeUudtVY%S&NjySSp1T{-a2=fuU3|M-r!EQ&-vrGeN6kSv1;iY#n(U0AR(UB8)jen zYOW0_|9cnZh!r#!`Eq2mZ&U9@8aoTs#iLH>of-Qe{XLH%w-8wcM)y&8Lm>@E$r#Mo?h-XUM&vUQz4GFy}c8csfQV@auN^qUOsg}|Aebty<)%ZH6 zy0}F~GyQ;~IX*EmIND$|8{0FiE42}fQ!l0YXj3GkeT#Z8Xm^t+h`_cf zzddZA)?N?sjY>Z=Q2bw>GZeyRoo;K2a#kwF|9;7ND}wtztNV4;`Yb;b`QPh5O$g+A zm_Arj-$$(paqLuPZFSLG3Hx%l){%k;bKGalyY$-EF$ue#k85i}AXjV|Zs9^$s{=ez z^lax(j>Hm~ZH1j49Vv+5Cu9*FrVODy-L=+7&IInJI%@B7yFDBI8+l}(bz(K&w`U(N z95CV~w_mu}&NjapW%_;24UM#n_j2pS=GFEi0=b4~cd z>Nt>s2#n7tN=BAfz3^^?{!7VJencP_p7iOR*MNpv%=5hZscl<)iTB&HBY$$wvJd?} zYI`=MC69OwV0a2wlpfPHtAiAx&Hooja+GQeQ1}OtX2kj8F2~k%9<3 zx6zlNzwfF&KXXM*P}@1KKWopHF&<+bz{+iG&uo3k2GeYcw)x-bO~aMET1>Ns+Sl6W zexx8mw#QG~V|%65+UAVb3U8fhLj-b(vvaVGso4f|>9TCVS+76!2zsMG@&70RkE3+*uc|JG=5w)8~vk#3aN@28- z>6^4#nQYP8&L6AUu`c8i;|R7N>OU38tXFY9;EyXUS)M+zdaJ#pIR{~u*SAQwvE|3)BJ<%gt+rD>jw zUe*01gZ%EuXd32;8!hE~9eBc5{l@_j~lg6*AkAf(W$QV&qA=8BiB;r8B;ba>>~;f$z09 z543UgqL&;Ki}d&7eI4H8nGxGlHM5VP@1$OtT-c5Xw`5bRzx#uKe17hU-|Dz1wM?@g-Zj&R#37LL-`P)NDIT@ogq#%NO`Z7D= zXdULyW^WQXaGOWN8(y57Efe?*hOi31@EIK6?}M+wxwF*@Uo#_+i_fOGm8I;2p&5*f z7aqgH5#q=(u3;WIa$yhuZv;{h!TmWQLptL)JxN(-X6a(zQEuj5VZDejw-NtOU&kjC zJet4fU_1IBh(Nh1O7-tuj>oe++P%xOObFyc4@dNheifn9w>yx62=u!of|rnjh?^IJ z{?)Eu_=-yXthoJb1&_AZ&Es%*doS8c_E zxv;l%zD>K$%_B5Iuy-xm$VG}za{L{xm_xg|Tj?>K)i9p{@ z^eTAog$U$oKri%usI@Pt4T%}0BLxxY+bPQI^dXMjYj)W8(#2TE;#%D z0(UILopk>}@e+O>#QS=TAc%1XWBN!z1jaS!D~s)y`xVOADtoW55BnR8AOvGpI6lgH z=`q4zeT+v7RStNOf{3!|qFISH)LYXnK#NHyD`PYYvmrzrC74YW9LXqc*{idaG1h}U zM0Aj!Tep=BCT>Fna$(zMSz$f{$_M3UMj#jV3frbL=k!DVbGzfTEZ=PN3Yl=9I$3Vy zQ)AootJAF-`P2SPapc$tJ5mr~j^YSey&wDCcI*|-2lh~oBkXm*N{GPtC88x_$gnw; z5rMHKL@Ubu1ta_iM|-s0_b+*oOGttHxN=O^`zRbajuzXNy^3!-U@KA(fo;<-bT6*& z-@C!1)u}LZ7q*UlHzW3}UE+BB>XxrfevgK|!rNCdrr!ecezfhDrp^X z3L?xWFEJ9XzlcCCaW)LLArRazK?HKSo<*}qFAgN#hKFvO;|rZx!GC6lM?(rCxb=}a zI-v*t_Vp~;!asX@@UBQu%m~cO`8oG|f741)diC3(hK0K@V83(X5FT}Mu?p|^I}1$? zmT#or?_67!ms=M;?R#3Sm1Fx4!8T+*jGKu(nZW&MR-;PrEUGAdLdJUA3|{7VOnaf3 zA`y5Nm6GDJLIiS&lT1qKA_BQSp%>mAyXQ71|>$OB%;Xs4BL?lV`OGT+H0ym^-hnz z`@bbNjBF;K!pOp*MCdLxMDy?1;n8bGY_egzRU-N%BZ4Pk-Y;4k`m1^qw_!vOv$qt8 zekw}CibMQ;#(MO|sjJzsb(9bGR#A%PnCJhi7LDWc3ijllkjJuMWIOg?5RU z6#MHjzHW44$=;>37b%F4@m+q8Q#@}DfAO;({nurks*7In5lXHB3?(AxgO{+sI1ZGE zL@auC)+8%LnBj&Rt|e*8`Kw~DuqUX~vW=*E{@=7DxFJVdlb&0&YE;8|-EkYKF7&SHw4ES8N`T^fm+Q zaSk}Ahp~p|dD)7< zHgFu~kz*TD?rwJPixBo5-AC~@%!p?Vr~c28BcjUobgW8_k%T@$BTqOnC$fLZ%r=ad z@On|N>U6m0+?}1r!ap_+sY{sQVU;e9R%XHDIJVF8XcHDG4qG{gA7h~yRpmXDV{*_q z&d*+G8{FU}tr1DFB6^YT{&^;NDjKEr_&GzeUP+lqG_T2w!1+LgEeo#s|ee$_A33T2zK>4{|XGs$7&g{4b(nFOBwPu#A>X}oc6n>fB)1}D>sYUwNwgJF zaOGuZrIKR|>F(Hh*Lk@o*H<^ovf`<;%p=|&NA$bUJz00r4&rP|8Cu(r6to|1CUd`{ zNU#2DQ{6UmRd+AS$}AsTgWnTEui4ucSj$V-*T3G$#0iF zhLButCgo;DC`wKyq>HmDvlgrf?3J8@|KAyu^UT+aXxrKba$&FjZv^IF?JWL>^X;DC zdJOTNcHRx;mWa1;yXMJcdnL29@O_M%b-Q!i`P*>5a}HeU(axNW_Mh%`K9bKfj$FLj zG20m4hUS=^+y*~E{uLFpqNU~>b$SgC3G=de)>%l-E0HZKo{PkrW8U7YR;QdHzXZJu zIi{v`NB^yNhd0OOyY#g;d49!vRsQ#)-(7SDvvE`P^k}UbPW0D{Y-hJ}iFYjKQ*ny< zNR}eX2jyl($ov~~UXGNZ6@jvnbKquDZdQbp3HAhEKAj}#zQ}bga_;6!#tb4t%%EB7 z?+B5tas7nNMO{_R6s*_H%2V{SlaUW+-D`0isAFWvRe^1*nBzrBRS1ZaMcV1o; zoM$oT=C-XPmr}%e#+a-XAu|C{qHZSJwjv}2GY?UBtq3U-v#exqxvXlgNl!WM{2xlu zyt+z~?usn$QChR5N0WXx!_6ecjF8djnQJ{-x*ZMt8)i23@ixT!F_b7q(iLSmo`QTdN2z%yU$s-rz;BDY5I?+RV!IS9G z#i?K;|w?mrvCC2!|5r->;0H?k?RQk zK2rRYV6UX4t*cg2+zb)fI-YcPvvag{=o(=X&w*9d-WWAVqXl(;!g$OBW zD?&=q&3<@x%z0-|uvfB&A45p4pmc*$w~hnbz!{Y7@is0josoRnM(N&)4`UT!K7ws< z#H-X9{^y({;{KR0_SX=hSA152|H$GDk6_Iw1V@|acn(%)Ku}`>$Fj0b5B?Vdxe)z- zdl`~qZtthw5p3Yx|D`3eziuXbg3`6l2kI3fWN)qWfxVJFakESn!dXyvKZcN8A6rp4 zgNTrG^W)ZE{LAmhYW>6R8LwqecfREeMpDe)t2~7b*t_2GYC}7%Ortau({M3FNG=yU znBl&&fDt>HzM{2nukxRoZ8HDz7gF2|5n1VM5R6j2Y|_U6ZKfCMvpgLQgrpz>V-6o~ z)O57ivCdv^O)#d92zmZ=u`oLC1fyTO9@q4j-m%W7B_SjQ>!osX?CfNdHjdSqUj&vU z^~!`u=5nzPP1CTwM)V_#qqY4f<-b6Yq>)Ps){9Z2#rxO$?`&wNf0-m*L|`;ZMsb?@ zesQFJ5UVfE5}ZLqNG=yUcP<@UXPljDz25F``8rNN*LRBHi^@2Ii?zL-j+HP@DHvfn zziYbh2)#0$@Nacvuf=*L0^4Yj{*~j}sh;}fc7EgavgC3zY_IaLv}}#XLza54KUZM& z>=t^_+#x#G5=lV>o`f&8_}%erXLY^U&~hmd^2F+51vjN)E*n2{cAS6TzkSo)z>OmO zmmQFT_2Q{$Z%7HXNAabB`5pSCK*;lsi@h24%2}g0w3f7A! z;eMkFsB6#0sf&*eNP&=NH5dD4`y=P~WBE94Ey^DlGd7J@ydvrqEv35kd1o(ZQg<`{nQB z>}e+*v6s3Tv_2dm>J{y!z7fqr2L!VzDKDdJS=;3Fo9&IBkQZyB$jG)il0I;0W`T z2iDN{t}3Y??0?se6hvTdB;^z>nrXZK+M_)z*1|Y{$k-CS`8bk;J!ox>s(wE>jd#gg zkJhwnq=CSuoU8N!Dvd z$XAUwtI`|A$0v6^d$8DnIfPQn5f0{fo~hM0ROhTSJ723-T}N{osy#dZlV} z6aIVFK*M}NL|{&tq7*JX!I!4nAm6da!Ev1GwBH$Pe0|8pX(AYTsl6?eed)G5 zzVr0!K>XAo&*x@@Jgb+nPp}Vu;?cWZ=wZx4ff}(^#iWwo_ z-PQWLzFr|$er?sdo3`Xk4!W-u*${l)VYV3M8fw^g7GLJ)IMrlYvg!z1)nDJV|fh9Y9-#(`IEFcpzm&=GI1aB1c9v|oH-R!jQ zAZ5Mq8RREkPB9}eVsU)TL_6&Ux?>sN4J3l=n2dzDjB@bCZ1osp|KJGP4UmEejB#{6 zJp^Yj^@`g!aVAgJ1P*3|zM8b6FwaV^j{&Ck=#7c5i{t0~^Xwg`No`NgnK0Ji0MmCZ zlHHZ{Ma1E8YoZWue>5sp%&3E(` ze~Tr&0i$`CxT6)s) z_tH3h{Ip4SvDbhGA2x<7mZbNhZ%dVjCi@2M7WrIky~mh`PBP$+b#0; zc^fh=Lf@m>mxE0*GWIaSay_rZzx<1`w%fac2pM5P1m^hlzZd8D?wi@ZTLV)fWF{cS zEOQJV>(fut>;5NM9DIFXPq2qFR>O59hP?cu*`AWD_O-3p*Xve)YeNbmDv=enY&{PABbUZUj95K`|rn-nnVgne*P( zpcNGezE)&TfQ!Cn7Q$kT{QXM9gXdbZyM`wtDTu&~l-mc!+0XVqX)jA(1>(Ak2$7K@ zbb;?ziZbPBM8d$e8|}O4lxn8Pdd)dAAYBszxx{HQ*v9{bKrW%vDG^9Pgg8wG5o2F1 za4hYd&)3KHs(i+4p zM*RK&wnt~Rt^y6DDSXQ_V?5826|=eY#<~B5iZub@=50q8}C*68B=^$ORrSB*6Ei5A-UX4 z-Y#Wp>$Rs^7EmXS?`0q)1?zRO#9GIk&nNIUmNwhu8+d7mmR;>*j2sb?%gyAy(WiM^ z*p>OiwKr4j20~J>UKh&{IO9Hg#UsI zQm|eZ3tx58`Q|!rBhBMOjvec==q0;Er9en7)Uk`j?)Ynjw9zlr3ywp!j$Ej3gS(&f z)js9X%S^dtcx3XP%f+H5MX;dmx|zH;I@WEEy#b9nA^SQ*+a(1NE_SwK1Pf~WwHnKO zuOk$F;r#Z7mLNiM;eAx`)uZf_zrPz`NxCa>u&D$6CF8g4$y8-m}O`pA|#iK zU2I9ekZ0UMXYd{J7nmET9XJ+l$O;jXi*j_5Z!N1AU+O6E(xtuY_`%R!Nx^zu>{)15 zcF54gLdpsMo5%>QarI_~mLNiM;qBtD?-x1_yYs7h^`IuoTSTmvG`~eS3u@vi&jSD5 zl@|lKZgn-Z?eZX57igMwlol^R}z65Gkfs62oGfboBymSOSKL_?#4Qh$Z1jKq> ztZrOZR{LA-b8r0Nl7CJ367`=YeT_B{A-OQ0x@P9Lj%KaeYAjZ2^7XH@qdCSdfDC(mt4+VSJ~^G~1$xIDOv3 zH^v&2IbJSSj4}b&p5hXv8?)pbHs^po{*Dyge!e!!Ku8KATr5KQ!z74Wm}^S znJZ5Vnv)*IQ?T|H;}n?Sg(tf zdUVv;`)@9{SF=+GPX5wG>o@j-p^1o)Try8eQK}XSSLYo|s}23DwK3;1KMCt~u|M;i zbRN6Lv);xPx#RbAOY7*P2EUkv2+4){ke|=dd~ZKBAUY9GJNrSeRr;{_bxORuK|SVv zE+XVv4bN0~mu^MK+i){N-qB~@>(K{}sNi3=H^FPZsgiv+kICAGtV>Ga<0F?c!8{4f zXW(rtd!0GyR?*yd>8oQNfVEfhcLB^6PTpWy5!fr4+kkBhqdS~S$MX2@b(`tMQ!1V; z_{imXcM^SX&@uk9w_mfeJCR~V$T9I=P1@T%DMuJjCT8hMsawZ^T7vU0^Bg$hr`J7_ zqVyO~z-$Q2TClbu_ddKu#IK%iEAP>pms_~YTYNcLQTas&yt~7@!j$Vn?f~ZXA@_FP ztLvRICToeLm=W?e(>e~EbGfUbR$38qe>H#aRsO03KhNT-l^SQ(L@7gS8}b)5&>G0~ zm{L|a4wRc5leG<*Q)J$q<@l@!DMhniBBjm|AAaAJth-VsE++G&P`X@J$JZ1|%IlL_ z!ZikaXzo@2EDd*+8L(}aS${C!3){1fL*~htzqlx~cQ~S5k*vwR!WAXC5X})^H~oy( zIR9r}QS$c`@D~x@)5u@c{B_rk#3m`mAv4`@OdK(0WY%59x~ECtZJkHXRZ@2K;~=0oNe zk@ZP_*<)Q%l7hKPm{VkJ0}(R62(x!ShLHJ1nEUe|%}46rb0;j!v&*pU*oK%v^L$v_ zkhcJM62g<06@hKY6C|Eetq7b0zEXo{a%}Ho2pI#wI}0lU$APCidH(zuLUQ39ixq)f zIC6R4Vns-b`RpuZXhld0N)+P(A4AA!1m4zsOm}f^q*b!EAt_idS|4j0STFWU&cC${ z8Fj=+5w1Zi0%e6!PAPROLdM0+Q8jswXB~&6m=W@}&)SBhm=Q9zXhn2Rj(?itqH=sz z1dbNtaB}31EEL(&+T-8-C-aDJ`n(OY;fIHW^fgHPlk0#E_2(wjne(2lTSt16CAmWAUq*iO^I6+`8IV4!y`k4 z;4+Wg!#%P;_u8UsH@79rhi?$kz={NLH?4hd98iWMPqajdeEzm{f>ut-g` zB2dFo^QFdYqh4K%$morz7~oGl!BDuqSMtKZ~g%@|RCpp~Aoj#l$p}X2u72T}J@Z zQ1&67M+ZCq)6gH?=Agate2<3pVtdc-#;{d~!&%+}yp5k`F1L@{yCm@XLq8J&xxV|7 z?uuT9v!@zIZ2t3gwRzq0>r>X%*N}pULic0Xlrs^m!F`TM`|7@ZZ`1Pnm~N3K1acLx zaG`9hLn&(xx_UVhe>I#LjEh(?~l7r`dQaKy?f|N5r1XsM5D7OEo! z5u+c*uwo@6*qKoNjhwA(zH`jDl}Ru7wv`EiT*qnTU7CfnD)l)cF)ZAd?Vmn@vR8-b zNI}FFn)6pt;VgYkj+oWAgm35E@s4-j(y1HjLawNLF>I_OD;rdfBUs-oj-r*@s|Ak@ zH6f6z8)@ZSJ&YB4!bhIF;-~%wf0WU}Mmuz*AR;sMYHHyyHn|)}_-m(f-0Id{E0F7) ziu!ttBwFcqDEsOreQDgJy9xjP?(IT3^s9Z%eMmvX=A3T!`0r4bbswK|Wo9-1tZpN< zH4ifd5P@9gUcI|9%07Nc6YcnxoH|kvf#ajM0LSWT?S2fX8Rse{1dja5`xsXDawzLn zkB_``k6QY!-P!#$9v0D&3+Dr8Q&B!kjMYlzZ{gqC^MQ)12v_Z&A7a>&^;y}AlhM@1 z%?^be2clAGmAASyq#&Xwlf7r+f2sbl^J2^|+1han`2J#x|Yc zko(!N>7)AX<-k`%q0EP2)1qz<7XR_^RwawDK_p+s4__-d4Y;#OS zE}R=PqQz5>_I&$f-{m~29d)?1rU-}+ExX1TT zn_eaaa-p54FJLb5XzTh{_P_k)ogMWj=L_0Jhla5}U&XMa&th1;nOWEu3EVR5`^%$M zEu;8d3)6W~caf{#^B5L$C<_~Lh|kBCV;;@-c}08vV)^{IY9kV3SjCaytoyVWhV9WW z7LN94pWPhkh&-FliwNYx-qLHQ8T56Sg~RQ;-*@uksvS-}>2p7f{eG<-L%GpDNcm&i z=y$!t5||ee$c0j;9D2$X-L*mSZ-~n3$C2Y`u|4{B8+{SzYS$UQ%tasg5P@9SwxWbm z24G^3m%h-G%Mx&eC|#^cQMOUu?)66F?BhE<_M+|E`haGT*0%q3M~0H7Um7PZ8J6x- zU;3W&eTYCVl)9qy;_t5(E!s8rLpLAp$a~2bDcCAIt5Bl@!{|7>Ta>8F)XoJc6KKV_hgDcq~9d_VTw?ZZaa$#>3 zr5R;Qwplyfck*5vJ5msVJyewc=mzWQxpCgE6T<9hIq#6aQ>0XO*73Uztak>=nffF< z8@iBd`-gKLeOI7J^IEIBYjW%hB?s6qzNJKWn&grH$!`dmXGq` z=)2Sp9oy_n)@SjfwH%(=&DIqNWqO*9tVkv|i>;lNy`j~mC}9DQ{&la)juj2>c(E>Q z1JU$m^qNN>*(<@`>fBl%B9IH)rk#_{ICpbh+EuLKy-1YR?_u=)v-1(GexVqKa-(0t z_}!y_IlQRWtB>Pl+_9PRrUcIeWNc=G{Z5`7x-6r z^!vxA*jJx!=)k(L4eTN1)*hj^4D|{-;`9D(Lj-c+_!MOlWfMQoxWc>k^QU&)Gw#uR zESnb2mTqmwu!rIB~M4w4uCe8er3$nTXVG^ z8hD-gyFgn){5CR_Ra+Fz(88g8qzs6&z4g0ewg(!8Hg;T~Guf5zvao!V8-aRdp2181 z_SM^FtgRMyObo0c#IC!fOGTm?jsvAYHgRrm{lv6gYV{j|NZ!W$$=TWCd~VZ9HEZIO zjh%G;#H7IN8-A4|N;t#lSN&p4s|b5Yvg+vfM((PkZR%K9$JWtaVQ*qm^eMdqKke+AQ$eUbh_)b)^95g(xwaRy4cG`XB=B zN-(mWFV*>-y>dkDI{CgHOLr(M>u_%@^;6o<8?SUl z7CJXH5-F`d)MIm7M6imKo6ph8lB}$XgJ=A{AjF&z2dXvMKPv$doJ+KUXhm_3z8P?~ zh|=D=*Q@io)o0zpv$54#%)MGbe{VS?g5BQFd-ePAhWhjWrmN*1XV8#>ZSb-fAHAr$ z(@@V!h{{J(A_Nz&DY{cQJDznMwV_o?r57FZtAFG_(MB7Bg7yAHh{I*FvUUnbOdQul z-*EDLpm)KODpC;f#3bE|gI#*|+rI{W-L%_;KrY^^G_}H5$vJ%FVTJw)l+WSPYrg2H zA_Wn=ZO@BPHv9vhkH60p(?0~t>lr^;8$b#oxYQF@gt0H{bA-KXdp$1dP+;MS#Q~%s z;-qQL9}T-1C|Po9pk>E)IwFvZx1FhIIP+%VZF~{kKo48qR*hXBp(6zmW-a->pI!gy zm#ONEb_Gock+{kx8!Y%JQ<=-`Ic$1lQ$Y87ZgOGzR`P}ysh;WSu<C zLaz|P%l+aa*u`Od&X<<$sFiKqRlTtPQVN9N;%&(FF=|5&E%lQcTAGOq4TPXzy*NHa zDYN)%E$yC@YLEHvd`LkAFE@{lV9RH4>8{LQTI3Hq8ejc=-=kRyJPcZA>`cQ!9L-u=+>Q?I{p~3$=%SLweT*^~vsOfm`QXCN05w z`S_%^ciGonyLV@AptZZKN!t;@%Q@PGv230Ad=y{vjke;S4S|lWN~J&uF5WA-1`qWP z(dwjWs(-N{N<|9Ri>sOD{Q6f~y*6h99p2nGt#d^1nuNY7N<^WrwRe-F152)MHQEpq zMDViEO8P~FY$1AWt)}*%gil?QwgH=xHyeALcP!&vLa%m*G+^KNiD17U<0G%ODM~Ng zahlq{%S#n0h%mSD?0ggbP3SaL|2>UnMTnks$k>2Y>JrX6X5&`0R=;xkmFUj?I;SEv zq+q@8skb{Lv$C$~I3i?Xtp3Z$!GZC&j;KgM1TTxZQIwXuYU#skp9vKB@pTG>;Nrb) z-6)J5T**h?zUz~~x_)i-%sU4eBNr5`m-jaHzo9I_u)Dvf@1pmsdMeN@bM*jH5W&kr zkLiWNqKOWi*7{-E-tI7v^#HU%iG8{qoCfb zc{Qzgl_deBV7;hsit->&7k$7VH`NuFGx?E%2woOiNpHzkyjJzKt@Zu;d#EVgxQ-22 z_N0|+p232{8fp2v?Fp5AD-b^NxsDi)2Y<(so4fvK;y6PsxgA@20jX^1v9ms0+FH z$mObS8Jk7BHs7hG@4nfzY7v1_r(A zK0bhTAs6Zb{YLKiCR(1KZR+|CVLDO}!OKGP6=l$wuG(+?tE+P}9Wv<^a@{p)d+RPf zH70UWAbqaRCf!8@t{X+^I4MRuJ?(1X!DD8uL9x~l!OKF&=v+THaNV)ZVg1_xT+KB6K85xgvFfMZ7va z32f=#R{yYdkTG&W!Fm_cI8r6s-2}3`Uz6SK9#TDk6h!c{)T`$UJL+Y}UJZOocGrp! zT>S4s7ib2b>@HHU-r^)Hu)E{B=P!-c7YNBjeS6WOtE*_42YD`GbF>wN_+zyBB?+S`mVak5Ag& zKRag8-v8v({M|O2RxQ?xQm0>KC%e0n>~2Z2yGTI2*3f9ZZLh~t4hU~6wSamg9=0hgELN3%$MOhc?Q+KG70{`Uf zY|>ps;JTsc2ie_yWOrXbVa6I1YYh>+EW9(icaG?)4U0P*ctCa+>q0KnQ2IsBtRcF; zW=-uxF`rtzOT%P;mm|ass^2t(8O%*~w>8<_?A>3gNI?WI3mv2TbF#b9WOv)`Por58 zg6nGchTs9b{I;CF-QL;1{B)#-6s&gy^>#~4=N)dNUD1TRay z`gB1@z1WnifxqiUr9cQSUX#!Ty48QQC-83El)$&~u{u()-mWAoX?L@dziT6ZxAWKM z14uyxFN?K887b@P>Mc*tRiBZ+YefhyE-PtwPyAR=PecChvT92LNWpqh-za-0H}&em zP4&^GOn#&wf|rF>(r>-4eyv_6yL)_J4;7{RZg)dtf6Y!OQ}YaNBY$@}`MbaMNHonL zB2X9TZ8-V6E$WR8+^B!Sq$P;pWqxi8`nx&E?)D^q_ZHb*tP8n#Z-tLa(WqWcwLNk1 zYWL7oCT&LqFUygmzl(Jt7azH_yDK|o(WcIGYMZ{^Y+AL5K&hMkU8Ep_m&LwIX9Mte ztq8$|x?FJU&v#b?g`YBG4T`mf2wvvi8P_qoG0EOl3mbema5|kc1wwG4hAPU{@DROAjhfnI ziZgV{*(llW@_NNQkIdf)W^nw5D1A`OGa!OKz;$DC`Tf0lWgn)P5B&596Q z`SUgcP5hSZ?x41v{qM={A_eR9Qg5Z*-90{5?>%jBU=;bgNI?WI3n`GS5^CvHZD#^E zXT45=5L~>s!n)G015=#gIoaJ3*c+bcK1QLF8Z0sQ-LGo?;-^eyeu?EQI7u9 zQIDrNpG$VviV$4aMIQl|vd)G=C_k%_9SL3Y!8AcB|0zDpkRxX-j- zlh@OMh z)N&N{sVnzMyUP(`p8ZF02GQR|3L!pPr63f6m@ zWF_q``nyO$1TV`Kh5oJ;A-K3iq}`4FzM#H3s+v}U;=4$}dQsoZ@m-`Kf|rF>((TgH z*J_@hTkGfa9xBRec;Uv$`zy{9<@K4jOSda5=5hShb=ql?p)~os zulLRHzaxJa>q0KnX)?h7_!q zmxbn=;|x}W;6e?h`wxmU_~~BlHQ8OHV7<6*6s0G{8Lm=%_wplVtU6yJgAlA_eOmO1=Hx{w`7w!OK!se)4yVsAmFq=w8i=5L~>s z((YnD15&VF-rN73&wvy}@UqYt`f@$pt0j)R8c3)e6|f=%7yrA^1@HFe!OKFA&HkW7#x9Vu8Zmx9oI%1ZYH~XgY2#qA-MS8rDf=sD@6a*R#WRy+NX9r zC+#jucj#4|!Tofv=Ak??cc+&sQV_v=C3K8-PKq-;r#QoX%4a|Xa^=2+nuz%fNI}F7 z>aENpdr$sutFeOvnJLbI6h!c{kbbf&9rB9-11`&bUqbNSgXV^(`hQ!> z@)?kV^`g}2luB`iWt7kGf$T0)5W&kL&O~_`HL|)INpS`%LU5smDoP28@3x^hLr%&gLkiZ5>qb#*bgx#SxKCX&p=q+e%j*?0 zxN}-l*g4VPMG7K#S!yEY?^+RptM!zo-~lwE{N3`6I{TYY{w`9m-WSwcX?J~Oce9e+ zRVjZLDTv@@Aq7RLO?G#7jWdD9YF*A0V#;!WucYyjTFiwD^LDzEs8UstOng^YQ&RxrajJ++22J9B2X8|mXO_bH5wa; zqdYRCAcB{rm$8WA46gk%{P7fLup$H(@2&7r>8(EG?;-{3VhH^z!nH;03lvA{l^2m^a2wvvV$lz;^Ps!h%Kk{%Ok@6X=2*JhwE-eG* zGyGYlS+d>b^@1YNsi1%tpK?E-g9itNq#2Ksz!8I$g8E7KL8IXeYR<7C%;tZJ2 zfD}aVvXFwJ+@<)gO807YXTMgh2*JgB+ba3p#0<)3xJ>@;WXfki3f4QD#__-7yGTI< zFAI&Kbx!{7GxB%Kk-uw22re!WsU`ou-V+F+d$k=u#Og@FdJB=PxZT}myql;#zKdSs zQK))8=6nDth~Qi|VP#zgluwK+R zbDRMwh~Qf^wl)BmOA_Wn=EasnX0X&~+6~>dlyDmOpMF=k5w$u`g?;-{3ZhpE~Lkc2zS!g9?I<0-JHlR2|Ly9w?te!cWC(kp^lR2LODTqK_Fxy?E zAcB{L9-HI4R)pZ*ZxRa`bnt2*Jh2C+#l2S3?Tci&8h+U8Ep_m&N>> z@71gb!NuE_T7q^LDOfKr3(Ys*t633(%Wcwj%-=-{*2`rmR}|(mAO#V;EUbh%f7gl- zT>S6SGT^(3_H&vi`@6heF@pmaHHR5Yr2O3w_cS%M=SvkSh~QUM^#F4*iMF=k5+y8BMk%IN|-b(3W zJ_Aw^!OKEp%=x=kgy7_pb+g;8j^lDq< z7NA$_D35F}<&n+o_EJR(BFt@I{;m}vdJ@&31+0&5g-r4_*@)?kV^(InprQOB% zYDhr@FN?XM*G?2?s88|T-tn(hD?)Jb-pcvF_i9MNdU5_`8XLrMju7>0Zr>5L|qGayM8; z?t@wp5yl!kb($a78*m}7bUxUjpDmkYefaD2*JhwF0}-|&wv!H_Y;zpw7XjK?)*xncrpw{oVg4zI#or zsZFAH!ui%jCHuQL=U;A!0=-&Jc6Td%pWz*S7Y8YbFt^c=>~1XC-OXfo5rJH%evSeU zpdID!u5H)Z{~7taNI^tj>aEOYC`b7WpHCVbC`)!1DTv@@F*kI74*9!Qgy5=3BbW1m z_i9MNdQa0hUsBg3e>AN_GkKI&HQG6FEh~Q;u6MJPUtNnO(hJV!tyM{CPBu&fYT_3eaQJRxy zd7td=0m|4y3L^d=T~{3+#r4D&E0Q3=p-?DN+#w{nyIr`YIK^E2=rY{ucL~W7w2O@BMvS*1BL~vO=;bhM;5Fxa1*6AK$y7_D5a)+9t zLk1HiSTE0lura!qlipy((i^O@lqrh{)IwXJSU7#5@NbpxjptcANmhagv{3mb1e73x z%fb($ZyG4hu!wF#XhWH@fe4|6`-bk6rBl&obSgScSuZHTdT}?)SuZF-1lk+rMiK8` zqg(5Kp|2WIf(R}PFO!}hbU(u^x)*0~0m^b~(KL~Fan1X+ZwkEIm3X%b`Mdi&y;M%WO0eF!G*^D!-Aw*&*|+J{rZ)kI(OgU!|u( z6}q3HWUnpKu0;gSx}r=cFT5yyH&LGQcTs`}F8jUkB@}fYKvCyPTV@!62%&|xAm{I* z1ncFpuzb3w=tLK~H6mQi8@yk#E7Y1RS$qCS%4eW^ak`TijuJ%RzM)@spr~^miaMX9 zdT!^|u}=0jIiZ6)P1%uUlQk$1UXvCf+^ zHiH$!{9TkFg3H3j=vQLM->nt&gZeMszZ-}UTJ?jQfhFR1!YILdA5m{V9p6O>BDgGO zf!<(Id^e4L(%4S-kp&`z7WdZAyBKFc3D(QK_4~WY=svRBa9LO-{TdYbySRdVIyFnoV&oYStR!d3q686K_P2qV1Az#k z#pClc9A*xn1nb4|$(aKvK?IkDCrdZPjwzrmq%RciQl@MmLTKTv%aK%+V7*)xHYP_> z0}(>&tYlZ1Ie-$Z7cEr&A{Qly;Ii0{^cy4O@9yF+aw$_b5Fxbq@BTeliLzcgQPxXW z%6dTw*30Ab@AL8_>uJl{#2O)eo~bB71lpUT{7zpr4x+EgAAWsS;u1t~S!B)9-G;$I zX2oh%wJilb>X}$S@3NM#tH&nVRbG0p)`{M${nq`ZiV{S~ZD1Z*AVTzHst5PS)4rw6 z$z3~nqbQFIC0K9iION@46lZ8a_u{;u?9HYB81i>8o7Tx@Ln90V7))m zIQ-G`zbMY|8}aVZ4B-Y!5W!_($8vl(5Fxa9M*O_%ez41^Ncp>6iFZ+g_2#6x^7C$Q z;@z&4M;1-IixNa|S?pj%`Gf9({DI;O_b87n5Fxa9W&OOnhVCP~LjG`M7o&Oq5`~To#s3zllWAkNkte)jkyc2t)`iv`|H9*Ttjeqp0&% z`c4=nSTF7yIr@PTL~vQ0iskoefe4|67AoJro4tGUM1Pm-6)RY}Uvqe#WBx8m5W!_( zW0dPmafTDYKd9#^e>V^zv<~%Z4t@#dk)Z_Z?M1!y`@5LGixNa|S; zh7zo|8O@cScQJn#C5Yg%*ei1WZXiNv@r?L+H5Tafd2QGy6A3p-A25N60DcY{*kYysPk^hZu^Vw#R)_REgqlW3&-!(P=fX1tWyLsWu(@7&@;7A zy)0goAcD(c{besa5FxasEm-BZ65kjk(WbNpMqXg^aIrQ%+%x6Fe zBDgGALeAd}LCQSTD}HeE%*=5W!^;XQJmI-M`x|n*3e5pCJ$-w76}* zmEiA9pakpXvaozP%OVgVv}Q@xj#f2_m>GY)p>t1|o!3okM7en9qO`toI)E z*8g5D1H~EAQa;1)l+S&VUlEw=RvtKfB1gC_x05g~iDE zyMYLy#eer(3GyyVu-;QNSAO2b{9TkFg3DsB$oad02%*I@;@?rN;r?BeV7+K>bhilQ zGi;>a`DsnR^MevZa9LQTqST-aq4Ja=^px)3#kuNPxTWv;%HPi8I??-&5p)kEMecOE z7Y8MXKwFUSXFv%exGdsjih}n*1|ozO+BAJRN&apTx(9L@`MW5=db#X>qlj4+fe4|+ zSHQz8rN9L1hLkS|dENqN^ftcb91vCAirlWj@ zK!nhmII1Oh08Yx^oz$a~*G2c@paknJHoPV9ZYJX0l9PuTe^PuGC5Yg%m<2hHED#~I zxVL`Z-QMA`v20LFv+0&0zL5(F*2}&1$MmODKEr1fj~U4+p8+L^;Ign7MM+D)YgvVU zU#&mokp&`z7XRJPyQk^B+V}MPYQ|3;O_X50S!k~OygQll8N~0ap#%|J7JG&6np{u! zK>j&bJxKSF1tNqN&y{~it)Mu=d5Sae?@gct>qUE$^BGWr2rdh&q^KI*&!AI$cQ?fu zaIV&zYMJQEPT&S0Vh>*ZMxmM`-z zB2Wu0lp+(9Ros{2yMrm80VRmQeIwsTh7v?@S$JoPl7sFe+e-J5O{CwO2t)`i{=1(U z^sGVVca+cIrhJCX#akuvF3xU=a;;zmD--YLr#!M~;$4&=f_o)wjPCe_{9Qz#*8Wnh zz!LFZ9F!oUJN4G@?_&NgN)W+iF$?m2WPu2wRh&jH*i}(5e-|ZK?*STze|9l{7bS?` zvfr*Se>V^zw0K7Ryo>p}D8YIg(_Hy^HwV2}YyCdG+KcjcQGy7xd^vv?5vav0>)%m$ z9~nvzf%Ycn@1g_|T=uiiNxFY`FvS@fALyatT;2Y*Rbo5|*GbOILXLc2qlPEMI--o)EOm+;Idd7`B&cp5kiZ5>wg+x z)EOmMFZcG-(GQd$g3Equ$Eb54LTK^d{Z9joexL;FMSG)6C-TCNQI^GwPG=01AObB$ z{$35|s%U8I#3&cHExbWRnLv?L7yW|dGx}Z)C5Yg%KbC=!)IfyLLhB*Bf?qO23D%1? zEk{yOf(R}PpHYsa1|ozOx9xup;xCz@1ncFpSWP*S8i){DxK8pf_o4*rMO%>XXFv%e zxGel2Ig%QP5L*0qzqRB23@E{Rd3^pIh2N{81QBR&@>>9uAcD&xsw&^VJ8e?yM7Crt zVOPISZw(BG`MW4VgxtnF@^|OZ_iDxHd$mA>=t+&Ktzm!Mp!*pz()Vi9=(`D&V7<4f zw|<7h-&aEkBDgHphN3uhFV0r_UCS8CX9z?HE$*#qQGyl&Ta-twmob%zmW%_J^=)L~vQ`M>&5N>q0I5yMGTZrC*(XPWij{=<6Dk zAcDu|-{<&iP$)qJ+MAreixNa|SwvMS=Pq|E?RfNLZ{3?I&Exso({B=I(no}h(;KAd zpnGzM==)>G=_iwS(A%`gs6RTzzgZkUxRthl*eSJvYl(pf)Z+5}<{9+7B^aT_w$i?y z@LZjfs-7B%5Lzo!cF;?_$e_n|A4`big<5Gb0~WeQew$K5NfpxSv@nytp!QfDYoZ9t z_pP)QMUNQKPgbd@m5~tL7KZ41ZU-V}J6mZDe)?!kdHscfS~zmKjg*U>=DR%}HC6Ty z^KJ1qdT6ao`mNxxI?t%E_7C)T%DC1$PT+Bz*xA_3Iw+&|`A?<1C_x05#SW&JWk_vv z*SkDgqu*b60ue&%`x0&Ryyrvo60>=B8+52=&Rsc2&9gbBh7zoo%l6(t25|TPVzX0ugGB5o*Zhvy>L!N3D*0hSR1|iyY%{&DvY=}rKQ>DRx)!$ z>dXd85V3_2A4g@-SG3~wa6a#A{;$X{Mo8UE21*dYWx*@-rCz`B#;F>M=y!g4n1KkP zg|?t5Gcxuz&%J!&il6$MffB5j%fez51zFRoyLdu{a-L7DYbxyR{f z3-qRX!SCLQ6-H^*#$K1~3K5-OwbiS?3en4ZdF1DJrEsnJrI9wKYKVF2PFuZxzYx6w z%?Z{kBN|;9=T#nN)HY^nY@!yTU%Y6mkKdR{|2GG>vEu6$-dA4+X;p7Dl@O?fGomP4 zKICxqm{r5|a(uKo?O&>EL`J<+rm;F|A)5T%IVp@q>y{aZM)#BUAfj=d6h&P%F(R*- z%&fDqjkJP@m_g$hGcAKYyeW_4&tvPIgD*5Szg-Y)qGZL(wtDtd8T1L}SY2)-s!DU? zvxomPzxnNm7bS?Oe6g+m;ca^ThtzDlKYumDyM6ayv%=I#k|m-R+B7jknsd&XlSi9} zil1XtU9`)-u9kmdx zC|~C4=lcD#LE7-6b5ztqH11$UdH=qfW43#M=KbFaReq*+)HBr1pf7UrjCR!PpUbY3s5S=_E92%&{fR7Kf%va2KiA62yP`V}?t8P4^ZeKYEt{;}Hdx3}tQ zjB8=jx?1uMxso7+mfYKtmF_s=9)4}KEk44;=PS3dsc?usCC+NY-`-DS$G9@PQy6*M zk4l0NT5@myzFXF{HpL+Gyz6J_dCqM--5#Phzd2U&YADKiaD%f^h?tf1W9rW=i2Z}(?a4?Y^11R;7Q_qL?=L_M)I(#*3cNahk?IAjUR zr;aYB<@w=|(f#9>8tygR=eWCQe;gg6#Z;T1R)1C0g;tH$Em zPZ`vbp9Xo4Mr+QV8Js^3$mu=yI8q;cF{3`D?HGOTn@GL=rOf*L2x~pWED-yAjMmBr zeG{?vr!fwmMPYqaKSb&UI)>!w_ z&D6%fqjSeUO;#g;5n|O+e2mop*_>X#dVP$q4S%nuAB)zeguZvox|H3^2q8fPj*q@8 zdK<0953252-*;KWZ5r+1)xmn52IF)@a7|)AD#{+}mE)Tt2^*?*ibqKxLiAQq#{CSxH(d5APGK&v)^dNW zAll3tGTm8s+ISBmT8s?QFZ3Ow%e$zZ{;E?JecnjkD`8Kg&7fi5IX8H!dvM=zuY{J2 zo_Z(RoU?zUb716PC+=--PtBHDe>s8oL_6JVl|`StfXDI8vuHCR{3}o1!jqgbXSCB# zMyA(KX%?bO{fv5rlU&YAZKS^4&@-W}muA;LKj@wD--qZK^*k+jcO5zrZO$C9-}76y z%RYpVAObx=MVay>+I$hT&N-&Wp76kt`}^*n1v)9;k2c@eTJP!XX?7JCl-Z^y0v+r6J+EIQ9BG48TC7#-7I$(#VXq~*$T%l#) zEGSBs%h9HLZE1%Rs}TG6XA$QIt%tJiAJTd(2yvdjy~%^tfLe%F6ou?+Sm!*HE;_PaeJibpyaw%bzg;!{H`+}9 zTD*#$K+ zsG_!Lf27{LZ)Sa8 zZ=~M6YZiUR1m@k--r8E%i=S(&_d8uEK}4Suk@}UsS@h9=@zbD2@_}0KR!h`+@9%l= zNrqa8ruzVL{i8NJ*GPN2eyidAB~qVoFSC9-^H?1bSQEYfXq{F2_RBA{i8<1kD8b!@ zHPP>LW*)88eB01uIf6tNI z(OUK{+nv~V)RNJs4u-iNb?c}7)pLV^2)Xar#?aNBz3cM3v^5V)m{>0&kWm%o?d80A?WqS#MS~6cn{QTInW9k%V*7MO40=1Bd=yv>a zsT2N=T;p1oM@Gn6{^ttCklQD7rRbKyDAIA1#ECo$;z=!|r=(ctnUdy}@%nmu-&_eT ztt;kPm!+#Yw$4QrC5S+_qet!N zl%91zbv2)cpO+A_mfx4447xKroGT6#Gi!~}Bo^f{3137;*G!SxTk2E_Gpc554YiO( z`S0S1swlb3)pu2{Fvf`LFw}<-5=0=oQZ#DffVdJ@(x^AKj*<|lg^a2wt3EH|jhNI@ z-FbJIgg`BxL%(0z|5!fP=2>aAzN?yRC_x0WEB&&=f`guwZ(3<*2Bwq{s3kK)nPkJ9 zhTcf)^Cm<>$Xe+8tXUUoJ~?_rO|dPlmQ5L`JJqx9>_#1Z?U26usz#^W*Q(XjiJSG} zX->EoJg7%ZeJ@`rbKuMrnwB%Qh7v?9iRr6*Fa6~n+_x?vjx8)Bk02KUYwD8YKG zQyU9i$J~8#HYLQ8`C;Zg$7c23(p)AYP>W|I<(;$c>bV;eVvVc3IW>Ha+Ix5r6D5ck zF`}=2{LC45*7?l{!T(avib|OOG1^q9^?A8|cfVXl_s0zElUSA!XY-de{(117v&dH? zO_U&FoTraoaqBhr=@Z;WRjPacyu0zWuT4vM{h^KC;j0(!Wi=!9ZB+i_?mc(?xly|I zx{ZD~B)J|jHi{5my^A(0))<+PyXaS*3s(l{ErNsfiv=6&MV=4PuRDVDZA7?A*Rf$J2}B6%A^(aHQ%cW>f7Q8Z7|t%Dx$H;uBSfx(-zJ=0(={F?xc*p^ zqI6hX+{~ALYeL_%s-~vytN)xQy?*=4nv(5e56QC}Qo&sH{BT6YX`vcQ&~~wHx=-dk zy)WpUG9mI*au2Qtt~stOeMLv(=v8)BSdGe8<4_ANQAWHW#HhIqDaJtmz)C)a_}_+a zXayNDWV;?w!bo3HnDX+}fs5)C0k@Exihvnvn9ZWHb(cU5@cl`i(oM-JMF;)b~b5>B~AFaqB0iRd5HC22{$ddt09IxGCZ zF9qWTg8PdI93REu?v*!F7MkeIUOQCcE3{*oOD-KvZ=NU+qW+e$kts=H`uP~=<+7#$ z%rN$SsQKHtS_z#$t01+Z03w;vPp`1`miuJ^p51>JhnlOy-^J(dA|p@>S&4r6y;-O^ zFJGpF;+rd&C_#kUx33=8B1lj53%6nYi_y+aTv%C&>1ef1edl@e^@QdP(TehXc6Kvk zw>3tO^-lBF`?mV4p10k<&W@5;6xo$xGMg%x|6E*ZjOkoZLZH^fk8SlLO`f}_cI?2t z+We(iH}_|1g~hsw5=8t>h-teNeRA(eLKJd0H&2Z%tj4)gnkYep%!lw7gUG<9- zpGyeTib&N?-|tDGUth^jgO6laV#emR?CjgMFAB8PMVW1k%lyRQzq4+Pgbx` z)gNQt{a?}F6eY^CCAJ2z63O1|4#k*U5UpEv`O!%cG?pX?)Dks`ad7Q1=FE*#x1j_P z{M;4eqj#wutNx*};a-#kB6$B>ZCs#eRKGOK=`2WZ{_LkdOFo5==E^t20^yU`EQ)0x zqjJ^s&t4PY5@ZQn8%tlTyO40NM0;EofA{w)5Wx~eh_W9cdWCgKTG(4(x44abaWR!d z-+6>G!t$c5kssSSOq)5StkG(9uv%eYU%l(i8@_qxa^JaE+`A6b*KN=G>Mt+eaOaxV z(ze~FO}B<}V}Xdl$IrQYec4v$zyIO5=w9M#9boN&2%&}Tk+&2*+}t{It?R<=D#p`O zQTp82bMEL|JfocwdpMuU1NvNa-%rhLBwsnwY_c%eNUg1R9SXL!mbKJbE8pg;?*GNM zl+fIJYj5O@?7RcDuwHDBc=!5HS3=qtNBi%1zjxG!jlShBFpL?Xqn`7dl=`G@QM$|w zCu8P2tM|L>`1WbEhTbIdBk~HJiV8n-=J+hRGt<>*4JC+>+upHny|;9Zl-@y4MoS3P zl6!UbQa5c;o|8uAV=p|9zwDsDO&hF7e$`kHFV{goup?NHU0X*_man6Ju4^W}Vqx~% z7tx8UU)Qwe)2_M;C5UKOCrYn8GenPDQil+s-)7b_Zfj*0ku>j9(e+|=fzv{fVoYW<$Rr(QjKCOzKgQ%BtmGuqdU zFkf~orlAB8xSEu$9y-&NbyQI^;;beiP-{_C7ro2$jCyN2`%pZw-*mNSj|yhpF-0_# zAOfvYQT|EDpp{&8*x0l!TtcAM67q#=ZV%E|_{K3mT^{Y$#XUyaUF9^CAOd%nqEt_L zJnTf|(uilo?})&28}^nNPEq>R&^#0AeJ4K+@N6K;==IY{xOh=dsqZUzr+Ml9Gn@zT z1RF}QdB}r| z4q>^VtG6J;_ zEw}L`uQxVtiKpRwB1Q=!q~0ppp%Pl!(+i9nCre5QhAt>s;E%y>INl@O?f zy;YPA8P2GlYPrp^+e=B~Km_tJoj;ydRI_(3VeZ=!CL`bpAkWp4dui1!mnxWxE|oV? zg7qRFE6Rv7KNw?b6*DgkmJz6h^QI_G?+-V!WGiC!`@XWYf`~u{r(A<8>CC^9y*FCl zEhQmP3;CGXXIdWf>-|fNH@Cti1Zv4E`0;d6b6lu@tnG3e1|m@F;>Y&-#Mj5&Rr5C>PV8V5 z*LvhHr_G!EgMku6;5k}R2IY2X-Kvz(z8bmOg$UHDL~S%*bi)09GRH*+-7lv7)3mIX z!#PVu2_i5aKzRU0n3i$h->SovPD2E09iTP}Wj^c9yqlk#N`F35bpsF~#N%D!kjeQuds?qX%x58izCfDtpMhxtBhj5o`NX8M&86tkew{_jyU zz1FT8_QJy`|M>qRpYJzl*!PDWeOu5Z&`(GkyD)DfP>Qrr!lv z8f_N);%G#x)NNcSLB!FN&Gpx{QtH-vbjh{XczL|1R&?_eFCtLu@5(LoqvKQR+0$^Z zLPyu}Za-99o1?3m>^u8CeSTxoYEVkuNX8>SOAI~t@VSW48(ShAZ}^OV%RTaGOC9G5 zBNmD>{#CRY{&=7#c6BiaY9X52@XziFYU611h}f=^nmbSn>%IA!+Kx%7zqrC@wciL) zv-Zz%>C7q)lpq45BIJcrw#fNKSv~jHY;wvY_m5Ua7}Um-j?wYY4i$IE5b zubOL*`(IzLW<53IAC~Xt_?A3N?E8}=QF^*ldwp%lPm8-;;OD{{mJJW*66nd^p#*-%kH}$hU&HQaHOf zhlNt@I6&AcPjTE#hUA{rTXiQU5|A^=SGoK7^29y@63RYo7SOIHR~8(*9QpB>y8K zAFcNTIcLxiM7d!Fs;Wq}s7Yx&+0y^bE{sAow0RTE%AR*A|phEjkOTb zLH`*2k^0NeZL9oZ8GCy4zMx7n-THeV!Y@gRu+S^^Qg(Fh(v)M#|2pUuDx}d_BA>~v zzguk-JR7aG9gyC;x6xwS?|um)@DxVu*{gzY%a)FYGp=0@|?JdyoXJC>LzRC_)7GM2WEwjGp)NWgnWpWPKW{8Pk4q z)_hYw2|{S0udOKM%2(Dti_Yx5GPAsf^CRYs$0Uzq&mZM|b5+n$S&Duj!Z#*bb4Dvl z;r$lk&+w!OUVlpqXP3VPxZJFoW5o6^|<|uhvfGo%X z60FzS%~pHWhF8?umT8l)b?T=Ok9|FnXZlu%wI0`KJ!A>iYuT>V#uIx5uiZ_GKz{Ty zUlLA)y)Br?x1$p0>Qe~+j9T1fA*?ac_qDZB#*xLF;}V91p&yM;2HB_Hac+w9C1rXa zA9FkbPl`E5@iXL>dzrI=bWWfcvYx}WZ%?%OrM89M5#sa1e|Ez5DC76eG)FLH@VsAK z$SF(w2)S1yx2L2X8)MeHJs~V=JfAOaxu?g~(-Dp1vvxNlxFjLql!9ZD5h%fW@svU5 zj~X%Fwt1t?m%p@k;b{WrO-9s-Yi8yfo+s`}RFH`$UPRz2oZe>aZf4ffp2pT{CL>S_ z&(suETh-I-o8@tQ>NJ0@Nv{|`m{e&Hb7kLqZS~xz6+(nKy<32C#s1S71ixNcOEGSCI>b}l`^o>;7 zA6F*e`3&2`ni5yg$62U_XgrJlHv+YA4rK&N5Fz_o7DjkX9ewl8UKk?qyh~4md)ZyF z$D_5>xt5S8<3Gi7y}}EV5p|n9ceJA~(9W;=!6{4p2)S27Uw8FpY8tIAty$TH^Mf-g zpM>ZCZn#&xmU-^I?Q29N}ErEzjHVi zchVbW*yH~42=xliwb(;Nsq~?$=}c9`+>*VhM?%0kN@`oVu<%I41?t(lgE*+pI*B0KDV~D zrH*Gc8S!21T3XZmUzo-heVr&l1h!2#o)n7KHa{-r(#lVxxBC8b2A)6gOy$e7)P6c% zHGWo#74e8bE$pqL)S`2F@(VQ*x+FW}U@Z}iz+TA+KI7cjS|fhV;IMc^pcb}AmcR9s zxBjS>j;lY9rYMeo9O?hP}vV`naoX=zgGsEa@ zE`A@SNfJO{Zz*Q^x{#;z$Z_#2C8$Chj2hN|HbuQg4->Kh}*% zdwX0gXX|0>I6oT;_R-hX$)q3kjl5msi1?H53daQ^Pz&cxQ7-i;pxv3fS}lH{yoU95 zt~*Ho>s7G6?dK-?oE!u6A$dde_+OgPdYo&PS*tP2tM2OWkPxVa?I}vcjhE`)6dAOj zuu>XI5HaLUAAQitEPB)B+(ufu#j{t#656VkVG;thTK4R&S8bV%-ZnC#=>hDP)oLwOOa*FpXX0k({3su zSvw*odfMq_=LhR?z7Y=?O7u={+vb?pAj)pZ`|>RU5Kh z%kvIAHTLMqp3GzS9~Ej4VyBI$P6%1zKWFma*(0|Q^3&PhMj)Eouzc-LAy|Tl=5shx z^RfFvYR=#NV`@>KPZGYqiir{~b5ATSJXxHz5hVyAM$T;nBK#){yH~#XVuX-<3SrHm zK$OY!WV=AH1QGu|SH98GDV}GM5qz#m90!%9HhiP^jl-6F3SrHzX^&hJBPWCyIkv&^ zAPaHIMwGGh`aj}jgeYgv}zk04q4;xxhI5N&)4VU2vgZHaA!CDJ%V zy(0P{qc7NqP#b|g5eU(?)dnJbvumFqeQQHy(VjoXvD$8g$zg14l0A&>EjWSpWCe`zeIA9>2A(WVTtJ%e%B&Me|&AJH221Gwy4(hyh~S5exiH z^Hy6o-$v^BK3sH>DVoX6Y`f8Z~X z*b1+FQ8#={u_>`wFCvZ+;(xa;y2E0bMfv>S>yPc>|6INpixNa&+lum<5Y=-HiJyL9 zbvR0}C+nz$_B2Y^n`ToXb&B`N-m>2FYR#Aco9#hT|hup~{ z$hMU~?}wW&KF@A0+W4DF^S`G zehDJ*giJA;uPT}0-=uIVS1M{KLBtmZ*(`Yg*{<@M2R#Zk7r!^d7iX&=Ay5mW6ch`u z!x2=vEp1164JC;1m1#d(Z5(J=(d?YEnPqj(V3aJKcL8 zQJMbknZDCqFAv*pp}i4KgHPP;;^>Pil=u-BGh5~OW{h}rAXXdU=O9XohS0`sJ?lR>&ug)H9X4(jzhG^Yo{og zx9@Rf3q(L0czU%EKM^7eA#fac9+VM__hb(pv}KR$3qnW|Xaj4a9aY_--5+?=_4mw@ z8lD>Qgd`)Hmq;Fao7%_|&?`h>53O-L+PcS;D`4buY{9>pbj$yT<<2>AdtB>&r;)>n z4((M&AFY?i(dMn`a$Fv*p#%}q+9-=hSJr~R-5(J-w!DVtGd#C7jTxkmh&%1BJ(Qm~ zg&ss`_wLMgY`a}rLkS{q4k`cYeY7@d{!_=_MW!Zft1?Jm_#s&TBTsD|+nYjdq`7?B zov#5i!(oaVJUY0~@ia1JI7$$KZPSLL^K6SO6XWlVS`~qk?o@B;n@8P!k2cg3#thPv zl{@NIM{+*g145iQy(^;K>OEnIKrL*Wo*(UtYA?UrXVh3ySQfuh?dFv>zjxD>0We+zqNGi)wF}j zi_v?c4lYEX7LJMD(Wfn_9cxtHJX> z7lmr;`24`rq@o0O7;SD^d&4y@XC@CKQ0t3F?ey;7r`Lb}lI`k4t6pZ=aeLLc^xrvA zf(Sh0(wVbN2eWYcmui)u?>vY=tTB2a5$s!sYqie*^ixVY*Eqi3=qTB(tZ9VkHrMiA%*ngcV8)Hw!g zH$N}nL;t_#b^@|M9ccu-| zEBe->`in>{)$+&c^37KwP=W~L6|#~FQQDt(@2Qz?Iua0pTF7IHGO}APeuJg;-jq8I zeG#->=R1yNq@}D$w)TF1xwiF(`IS+E2()RsE9~v}af}$)^JyF+Q0rH^|88Dl z8@GIKcIk{j|M#7|=#FXh%ifFX*8LpDu#%8-$;%tcs?4hC@un~Cz5U6GKP@F6Wk|vL1pxrAG5yE+s z$C24aoU#!j>VydFA-xU%$nXE@|7pcsS#yF~IER#HnZoMT+r&1kQ+yyo%%Sg%yVVBu z4(r0v;@Z%C$aWhGKeN}|j#D85=S@*s*dw1ty~4Usi~sJAWyPnq#!)i4g%FZJgg>HV zV->*X;q+KP%KkR~Ha5)u)pg|k4vIk{q6 zTw^-b7ilvy0nZ$`9vDsF+WB9M`LJxWP?R77tx{3$?>rU9@r)%u7oi&j{1Fe-!gv62 zV$5iB>f#ojpcxmucd7J@@cb#a5#&hid3>p% zIdNuYQo^J)E^nd)5jbyj!}$7&X7NFbT>Gn6G|`(tF9ZExMJZUfocUt^KGzGSvV=gb zp(8u$WAdlhXZU(`@j?Of?AER7vKwVglpq5AU^<^)OJzRFcv*E!a!3f&8rrI}erI|n z-SD;1cE>ZL)q)^x)#9=yN)Um5Fx~6Cqk+*iQz>m?jY<*%wa^b%l3F6>`+dyDXl+XTc``)+<}$xaZBtr?waypECH|#hMgl<=XKT3wQW2 zjAP;`K?K^gqU8DTSzJ)lAAR4YA_BFrhxA5iNW1Xslkc-9E?FYZG@|KFr^glI?!2Gv z`^pq0h>+WuuyLBB#-q}o#}2=9JN^cb9QGR8v5d%etCr&tMRKN(UFgXEy<6Xs_KEv$-$?zD zql&K_eY>Mx<3UwDfAS~p4L3T`smSqpf5#p|luEJGfs*X2b-g`lO^k`su_lViY#e6v zYT8L__-eONyF(TIM(M}y_ebS6WJG+namLCfnzr|89upC$b+fQrzeF`n%)+L%w;DoU{4i?gg=-R#A)+u-Rc^{f1?w2l{#swhDO z&N}Unj$70kpE}M=g280u?2QK#Nh7PCGv{ubix*d4F0bAyBKs2hG>31K;vo^{p__?0dSq zx+6m?10{$+TcD>}`Lx>VGmXrk&sAxz>K4@XVhbL*D-7tQv*tF!OdbRq>AIj%EvGD}j2=b#7k| z%P(e2+`nq8nx;izv*wIaCf0>oXw!6u>HUn}k*_z5twV~DL6^wXN!hEnb+&oh$w}e0~ zTv@W+X8#(W|Ix@i`t?E;C5Y%&rmAlox#qJa9Rg@qCEr!kpjZdh5xpSJv&t;_@g<7~b>1og} z)O+ZcCfeE@8O$#WRMi_jdFW1~(f!A;YPg!@`xa{F=(^CQ<^E7YLZH^)2i^K_mma$B zhw_^LK4h<2|CCe98j-<72_pK<*7a;J9=cl|XT;3#-D>g1ZMERNzZxh(1X@0Q!IL*s z`*5a+ws+1L34vNYGgZ^oyAR!`bFr1ASdv`(eOgN`_4ChElpq4n>{Jm%eNzQ=%@YPwuAIdanxAP=W}fliSy;y~UUluWrxdIvmnb`@G*H z6(xwk^{3hWGS*x5p{l)lRa8R+YR$}8RWCy;+wLXzYTb7qj2xd=*5;3TtD*!Er7Kp^ z>t288?o*Hv)py=7YR0tCMqHVpq687RSLhklrh&PxUS@5I`?L!Ys8x!1cjL8(?l&>a zaI1{lMyVt1wAa_F8Yn>oS|!EXo98j3KF_NC(=DBe2-HHGrjyr%?3(L;HO*Cn>#Kq5 z(J1VpkEziX60O7xv=UwqfnbZ_vc=Tn8-{5Q=M*qUm;2Gcx=;&kn&Jc}PpQ?lre?_D zxFohK>SfF4vc=T9lb=?1epAgH(do5>KrP&9bdT_#^}Q>fer^7A^vfiBP}Ixw)|lF` zn0iXB`<~dF_04YOvPlTkl4rN!-rQ!CnaRAcEThB>h`@CsyLxucNLe(>>@mHPwC0H5 z_2(X1-2UXp+NRbhxA|wr<1VZVwb0(^iIe=CaXeRBbI-cTlI1C2(NKa2+?$G0ZBrgsm5`2R^#SreM+DlKqU`8= zLCt(Gy}5BEed7n5fm&$O^mHB^>ODx@zQ*SE;Xgb`b#A%J2v72R?4U_P@RAf)h?{zQf{nAwdLNyZY0E|KN5ZK?Lp<%5}~ks<}@V(H{S7 zal1gERuAI#t`i>E-2QHHaxHYa8W0=0N=o*n(b{np3r_4nL1(j0E5{dm>lb|FCo?s-LNP29dAS5~cfPm9|H z0=1ZZgoV=gQN-=Nht)LKceS`(tQ61g$dmVd+>W+D-$#)L@ZGeQ=EMLiK?GaO2tr%j zzP(A9)@^11GYfG$)`eQKwQnbG|CzWw>@SPk(RM|>Z24Taxc!B4TK%(bH8Z@I#q9!t zTJj#;b)dfY0&#moo7-^@ih6n8cor;fuTcEHr|hlz=8>`%w+jSn$+O#uxc!4SlUaVb z#qDC=5h1U6+n48zYDJ>V3sWp^#}yPk;q~VpTHKyxYHjmWliYL%oyF|}fm l%JUL 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

Z2Lm5g=~t6vj6-d+QwW_C_ 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

?vvV!GKrCB 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

=ZRwx^cDG#mzlkNT61eB{5nK$+$Ip^nXcm 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%0A4p4Co0JV_jdw1S?c6vx%(q@30iaEhKF3x== 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 Date: Tue, 22 Oct 2019 14:46:21 +0200 Subject: [PATCH 722/994] Add files via upload --- ...Leapfrog_Bolt_Pro_global_standard.inst.cfg | 14 +++ ...rog_Bolt_Pro_abs_natural_standard.inst.cfg | 119 ++++++++++++++++++ ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 +++++++++++++++++ 3 files changed, 250 insertions(+) create mode 100644 Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg create mode 100644 Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg create mode 100644 Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg new file mode 100644 index 0000000000..76008cc89b --- /dev/null +++ b/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 0 +global_quality = True + +[values] +layer_height = 0.15 \ No newline at end of file diff --git a/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg new file mode 100644 index 0000000000..1e8596d84b --- /dev/null +++ b/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg @@ -0,0 +1,119 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_abs_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 35 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + + + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_min = 0 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_min_layer_time = 5 +cool_min_speed = 10 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = brim +brim_width = 8 +brim_line_count = 14 +brim_outside_only = True +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg new file mode 100644 index 0000000000..6f91548dda --- /dev/null +++ b/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg @@ -0,0 +1,117 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_epla_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 50 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 +acceleration_enabled = True + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From c37131291d2355ef78c75334abe3eb222ff1d743 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 14:47:55 +0200 Subject: [PATCH 723/994] added quality filey Leapfrog Bolt Pro --- ...Leapfrog_Bolt_Pro_global_standard.inst.cfg | 14 +++ ...rog_Bolt_Pro_abs_natural_standard.inst.cfg | 119 ++++++++++++++++++ ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 +++++++++++++++++ 3 files changed, 250 insertions(+) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg create mode 100644 resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg create mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg new file mode 100644 index 0000000000..76008cc89b --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 0 +global_quality = True + +[values] +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg new file mode 100644 index 0000000000..1e8596d84b --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg @@ -0,0 +1,119 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_abs_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 35 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + + + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_min = 0 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_min_layer_time = 5 +cool_min_speed = 10 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = brim +brim_width = 8 +brim_line_count = 14 +brim_outside_only = True +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg new file mode 100644 index 0000000000..6f91548dda --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg @@ -0,0 +1,117 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_epla_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 50 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 +acceleration_enabled = True + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From 66bc20eab1633e62d321d7b4c038c3e47c21ff3d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 14:53:11 +0200 Subject: [PATCH 725/994] Revert incorrect material handling code in VariantNode CURA-6921 --- cura/Machines/VariantNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 1c5474422e..334a01158b 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -122,8 +122,8 @@ class VariantNode(ContainerNode): if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up. if material_definition != "fdmprinter" and material_definition != self.machine.container_id: return - material_variant = container.getMetaDataEntry("variant_name", empty_variant_container.getName()) - if material_variant != self.variant_name: + material_variant = container.getMetaDataEntry("variant_name") + if material_variant is not None and material_variant != self.variant_name: return else: # We already have this base profile. Replace the base profile if the new one is more specific. new_definition = container.getMetaDataEntry("definition") From 2e5c9d53b7c8336c18fbe13bb613e266df4c24e5 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:00:08 +0200 Subject: [PATCH 726/994] Delete Leapfrog_Bolt_Pro_global_standard.inst.cfg --- .../Leapfrog_Bolt_Pro_global_standard.inst.cfg | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg diff --git a/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg deleted file mode 100644 index 76008cc89b..0000000000 --- a/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 0 -global_quality = True - -[values] -layer_height = 0.15 \ No newline at end of file From acbb8c5368676be0fbd41507ebf97ba0e4cd2be1 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:00:21 +0200 Subject: [PATCH 727/994] Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg --- ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 ------------------ 1 file changed, 117 deletions(-) delete mode 100644 Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg deleted file mode 100644 index 6f91548dda..0000000000 --- a/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg +++ /dev/null @@ -1,117 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_epla_natural - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 50 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 50 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 -acceleration_enabled = True - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 4 -cool_min_layer_time = 5 -cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file From dbbf8d138a5e640b6cbddb19d0be37509adebc21 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:00:45 +0200 Subject: [PATCH 728/994] Delete Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg --- ...rog_Bolt_Pro_abs_natural_standard.inst.cfg | 119 ------------------ 1 file changed, 119 deletions(-) delete mode 100644 Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg diff --git a/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg deleted file mode 100644 index 1e8596d84b..0000000000 --- a/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg +++ /dev/null @@ -1,119 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_abs_natural - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 35 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 35 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 - - - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 30 -cool_fan_speed_min = 0 -cool_fan_speed_max = 30 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 3 -cool_min_layer_time = 5 -cool_min_speed = 10 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = brim -brim_width = 8 -brim_line_count = 14 -brim_outside_only = True -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True From 66005f28f31c343aff697d22ecdbc1d06a6e86c2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 15:00:51 +0200 Subject: [PATCH 729/994] Fix typo in removing Alternate Skin Rotations --- .../VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 4858c6f9bf..e8eefb1bb0 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -65,7 +65,7 @@ class VersionUpgrade43to44(VersionUpgrade): if "values" in parser: # Alternate skin rotation should be translated to top/bottom line directions. if "skin_alternate_rotation" in parser["values"] and parseBool(parser["values"]["skin_alternate_rotation"]): - parser["skin_angles"] = "[45, 135, 0, 90]" + parser["values"]["skin_angles"] = "[45, 135, 0, 90]" result = io.StringIO() parser.write(result) From 52d066a1ec20570344c13b2b060071da9c4b4d8a Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:03:36 +0200 Subject: [PATCH 730/994] Delete Leapfrog_Bolt_Pro_global_standard.inst.cfg --- .../Leapfrog_Bolt_Pro_global_standard.inst.cfg | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg deleted file mode 100644 index 76008cc89b..0000000000 --- a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 0 -global_quality = True - -[values] -layer_height = 0.15 \ No newline at end of file From 1597940dcba58005b7583337f7a250c6bbe5cdad Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:03:49 +0200 Subject: [PATCH 731/994] Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg --- ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 ------------------ 1 file changed, 117 deletions(-) delete mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg deleted file mode 100644 index 6f91548dda..0000000000 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg +++ /dev/null @@ -1,117 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_epla_natural - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 50 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 50 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 -acceleration_enabled = True - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 4 -cool_min_layer_time = 5 -cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file From 4c2520c302a126d954a610d7027d949f98520db0 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:04:04 +0200 Subject: [PATCH 732/994] Delete Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg --- ...rog_Bolt_Pro_abs_natural_standard.inst.cfg | 119 ------------------ 1 file changed, 119 deletions(-) delete mode 100644 resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg deleted file mode 100644 index 1e8596d84b..0000000000 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg +++ /dev/null @@ -1,119 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_abs_natural - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 35 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 35 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 - - - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 30 -cool_fan_speed_min = 0 -cool_fan_speed_max = 30 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 3 -cool_min_layer_time = 5 -cool_min_speed = 10 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = brim -brim_width = 8 -brim_line_count = 14 -brim_outside_only = True -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True From a5fe6c6668009cdc6885a128ff114b9986f3adb9 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:04:44 +0200 Subject: [PATCH 733/994] Add files via upload --- ...Leapfrog_Bolt_Pro_global_standard.inst.cfg | 14 +++ ...rog_Bolt_Pro_abs_natural_standard.inst.cfg | 119 ++++++++++++++++++ ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 +++++++++++++++++ 3 files changed, 250 insertions(+) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg create mode 100644 resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg create mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg new file mode 100644 index 0000000000..76008cc89b --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 0 +global_quality = True + +[values] +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg new file mode 100644 index 0000000000..1e8596d84b --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg @@ -0,0 +1,119 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_abs_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 35 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + + + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_min = 0 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_min_layer_time = 5 +cool_min_speed = 10 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = brim +brim_width = 8 +brim_line_count = 14 +brim_outside_only = True +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg new file mode 100644 index 0000000000..6f91548dda --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg @@ -0,0 +1,117 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_epla_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 50 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 +acceleration_enabled = True + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From 45f0f1738bcaf2d23df4678dce36a717d916e771 Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:07:06 +0200 Subject: [PATCH 734/994] Add files via upload --- .../variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg | 12 ++++++++++++ .../variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg create mode 100644 resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg new file mode 100644 index 0000000000..7beb6d44aa --- /dev/null +++ b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = Brass 0.4 +version = 4 +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg new file mode 100644 index 0000000000..c4a3caf61d --- /dev/null +++ b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = NozzleX 0.4 +version = 4 +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file From f2c66f8d3a4f2734d6a0a8de824bca8cdad039d9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 22 Oct 2019 15:30:19 +0200 Subject: [PATCH 735/994] Fix TestVariantNode CURA-6921 --- tests/Machines/TestVariantNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 4e58069be3..bc860058a1 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -16,7 +16,7 @@ instance_container_metadata_dict = {"fdmprinter": {"no_variant": [{"base_file": material_node_added_test_data = [({"type": "Not a material"}, ["material_1", "material_2"]), # Wrong type ({"type": "material", "base_file": "material_3"}, ["material_1", "material_2"]), # material_3 is on the "NOPE" list. ({"type": "material", "base_file": "material_4", "definition": "machine_3"}, ["material_1", "material_2"]), # Wrong machine - ({"type": "material", "base_file": "material_4", "definition": "machine_1"}, ["material_1", "material_2"]), # No variant + ({"type": "material", "base_file": "material_4", "definition": "machine_1"}, ["material_1", "material_2", "material_4"]), # No variant ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant_name": "Variant Three"}, ["material_1", "material_2"]), # Wrong variant ({"type": "material", "base_file": "material_4", "definition": "machine_1", "variant_name": "Variant One"}, ["material_1", "material_2", "material_4"]) ] From 59e55dab5ee6731a868098672935c8a8051b6d0e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 17:23:32 +0200 Subject: [PATCH 736/994] Fixes for consistency with other printers Contributes to issue CURA-6814. --- ...l_Prusa_i3_MK3S_MK3.def.json => prusa_i3_mk3.def.json} | 8 ++++---- ...truder_0.def.json => prusa_i3_mk3_extruder_0.def.json} | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) rename resources/definitions/{Original_Prusa_i3_MK3S_MK3.def.json => prusa_i3_mk3.def.json} (93%) rename resources/extruders/{Original_Prusa_i3_MK3S_MK3_extruder_0.def.json => prusa_i3_mk3_extruder_0.def.json} (75%) diff --git a/resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json b/resources/definitions/prusa_i3_mk3.def.json similarity index 93% rename from resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json rename to resources/definitions/prusa_i3_mk3.def.json index 439cc1fcda..0b55e4f200 100644 --- a/resources/definitions/Original_Prusa_i3_MK3S_MK3.def.json +++ b/resources/definitions/prusa_i3_mk3.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Original Prusa i3 MK3S/MK3", + "name": "Prusa i3 Mk3/Mk3s", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -10,14 +10,14 @@ "icon": "icon_ultimaker2", "platform": "Original_Prusa_i3_MK3S_MK3_platform.stl", "has_materials": true, - "machine_extruder_trains": + "machine_extruder_trains": { - "0": "Original_Prusa_i3_MK3S_MK3_extruder_0" + "0": "prusa_i3_mk3_extruder_0" } }, "overrides": { - "machine_name": { "default_value": "Original Prusa i3 MK3S/MK3" }, + "machine_name": { "default_value": "Prusa i3 Mk3/Mk3s" }, "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 250 }, "machine_height": { "default_value": 210 }, diff --git a/resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json b/resources/extruders/prusa_i3_mk3_extruder_0.def.json similarity index 75% rename from resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json rename to resources/extruders/prusa_i3_mk3_extruder_0.def.json index 18d69e4557..29156f0d70 100644 --- a/resources/extruders/Original_Prusa_i3_MK3S_MK3_extruder_0.def.json +++ b/resources/extruders/prusa_i3_mk3_extruder_0.def.json @@ -1,10 +1,9 @@ { - "id": "Original_Prusa_i3_MK3S_MK3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Original_Prusa_i3_MK3S_MK3", + "machine": "prusa_i3_mk3", "position": "0" }, From b2afaf305d0b623f33bd36fc62801cfff9aafe1a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 23 Oct 2019 08:32:58 +0200 Subject: [PATCH 737/994] Add @api decorator CURA-6665 --- cura/Utils/Decorators.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 cura/Utils/Decorators.py diff --git a/cura/Utils/Decorators.py b/cura/Utils/Decorators.py new file mode 100644 index 0000000000..0d7065f2f9 --- /dev/null +++ b/cura/Utils/Decorators.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import functools + + +## Decorator for functions that belong to a set of APIs. For now, this should only be used for officially supported +# APIs, meaning that those APIs should be versioned and maintained. +# +# \param since The earliest version since when this API becomes supported. This means that since this version, this +# API function is supposed to behave the same. This parameter is not used. It's just a documentation. +# +def api(since = "Unknown"): + def api_decorator(function): + @functools.wraps(function) + def api_wrapper(*args, **kwargs): + return function(*args, **kwargs) + return api_wrapper + return api_decorator From f3736f0576085ca22c22942a28774d41f75229d8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Oct 2019 07:40:12 +0000 Subject: [PATCH 738/994] Add typing for _machines Contributes to issue CURA-6793. Co-Authored-By: Jaime van Kessel --- cura/Machines/ContainerTree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 699c621fbe..a058eef72e 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -84,7 +84,7 @@ class ContainerTree: # This handles the lazy loading of MachineNodes. class MachineNodeMap: def __init__(self) -> None: - self._machines = {} + self._machines = {} # type: Dict[str, MachineNode] ## Returns whether a printer with a certain definition ID exists. This # is regardless of whether or not the printer is loaded yet. From f1e35907d255dbc2a148df144982f83a3eeae786 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 22 Oct 2019 17:57:30 +0200 Subject: [PATCH 739/994] Make MachineNodeLoadJob protected inner class It should not be used outside of this class. Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index a058eef72e..b4e7980734 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -77,7 +77,7 @@ class ContainerTree: ## Ran after completely starting up the application. def _onStartupFinished(self): currently_added = ContainerRegistry.getInstance().findContainerStacks() # Find all currently added global stacks. - JobQueue.getInstance().add(self.MachineNodeLoadJob(self, currently_added)) + JobQueue.getInstance().add(self._MachineNodeLoadJob(self, currently_added)) ## Dictionary-like object that contains the machines. # @@ -129,7 +129,7 @@ class ContainerTree: ## Pre-loads all currently added printers as a background task so that # switching printers in the interface is faster. - class MachineNodeLoadJob(Job): + class _MachineNodeLoadJob(Job): ## Creates a new background task. # \param tree_root The container tree instance. This cannot be # obtained through the singleton static function since the instance From f69360fb145bef3ea15f2e9d8e84439c39007d30 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Oct 2019 09:42:43 +0200 Subject: [PATCH 740/994] Make lazy-load container a protected inner class Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index b4e7980734..5daae32826 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -39,7 +39,7 @@ class ContainerTree: return cls.__instance def __init__(self) -> None: - self.machines = self.MachineNodeMap() # Mapping from definition ID to machine nodes with lazy loading. + self.machines = self._MachineNodeMap() # Mapping from definition ID to machine nodes with lazy loading. self.materialsChanged = Signal() # Emitted when any of the material nodes in the tree got changed. cura.CuraApplication.CuraApplication.getInstance().initializationFinished.connect(self._onStartupFinished) # Start the background task to load more machine nodes after start-up is completed. @@ -82,7 +82,7 @@ class ContainerTree: ## Dictionary-like object that contains the machines. # # This handles the lazy loading of MachineNodes. - class MachineNodeMap: + class _MachineNodeMap: def __init__(self) -> None: self._machines = {} # type: Dict[str, MachineNode] From 5b70d409eda079700485c10b4e32bb4224ed45de Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Oct 2019 09:46:44 +0200 Subject: [PATCH 741/994] Improve documentation for lazy-loading background task In particular the thread switching sleep was a bit mysterious. Contributes to issue CURA_6793. --- cura/Machines/ContainerTree.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 5daae32826..6c4a0c3450 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -146,7 +146,10 @@ class ContainerTree: # # The ``JobQueue`` will schedule this on a different thread. def run(self) -> None: - for stack in self.container_stacks: + for stack in self.container_stacks: # Load all currently-added containers. + # Allow a thread switch after every container. + # Experimentally, sleep(0) didn't allow switching. sleep(0.1) or sleep(0.2) neither. + # We're in no hurry though. Half a second is fine. time.sleep(0.5) if not isinstance(stack, GlobalStack): continue From aed2346465d0ea8c6005871c9cd9bb7330ef15ae Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Oct 2019 09:53:22 +0200 Subject: [PATCH 742/994] Don't sleep for extruder stacks Contributes to issue CURA-6793. --- cura/Machines/ContainerTree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/ContainerTree.py b/cura/Machines/ContainerTree.py index 6c4a0c3450..c2bfabea2c 100644 --- a/cura/Machines/ContainerTree.py +++ b/cura/Machines/ContainerTree.py @@ -147,12 +147,12 @@ class ContainerTree: # The ``JobQueue`` will schedule this on a different thread. def run(self) -> None: for stack in self.container_stacks: # Load all currently-added containers. + if not isinstance(stack, GlobalStack): + continue # Allow a thread switch after every container. # Experimentally, sleep(0) didn't allow switching. sleep(0.1) or sleep(0.2) neither. # We're in no hurry though. Half a second is fine. time.sleep(0.5) - if not isinstance(stack, GlobalStack): - continue definition_id = stack.definition.getId() if not self.tree_root.machines.is_loaded(definition_id): _ = self.tree_root.machines[definition_id] From 33cf7491ef94c289595978c9916e4aa11cda9caa Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 23 Oct 2019 09:58:03 +0200 Subject: [PATCH 743/994] dos2unix Decorator.py CURA-6665 --- cura/Utils/Decorators.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/cura/Utils/Decorators.py b/cura/Utils/Decorators.py index 0d7065f2f9..3f652234d5 100644 --- a/cura/Utils/Decorators.py +++ b/cura/Utils/Decorators.py @@ -1,19 +1,19 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -import functools - - -## Decorator for functions that belong to a set of APIs. For now, this should only be used for officially supported -# APIs, meaning that those APIs should be versioned and maintained. -# -# \param since The earliest version since when this API becomes supported. This means that since this version, this -# API function is supposed to behave the same. This parameter is not used. It's just a documentation. -# -def api(since = "Unknown"): - def api_decorator(function): - @functools.wraps(function) - def api_wrapper(*args, **kwargs): - return function(*args, **kwargs) - return api_wrapper - return api_decorator +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import functools + + +## Decorator for functions that belong to a set of APIs. For now, this should only be used for officially supported +# APIs, meaning that those APIs should be versioned and maintained. +# +# \param since The earliest version since when this API becomes supported. This means that since this version, this +# API function is supposed to behave the same. This parameter is not used. It's just a documentation. +# +def api(since = "Unknown"): + def api_decorator(function): + @functools.wraps(function) + def api_wrapper(*args, **kwargs): + return function(*args, **kwargs) + return api_wrapper + return api_decorator From 08b1e0e9a87be0b9c8e359a39bc37b1d61c3904c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 23 Oct 2019 10:34:47 +0200 Subject: [PATCH 744/994] @api checked for semantic versions CURA-6665 --- cura/Utils/Decorators.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cura/Utils/Decorators.py b/cura/Utils/Decorators.py index 3f652234d5..52f61eb1f5 100644 --- a/cura/Utils/Decorators.py +++ b/cura/Utils/Decorators.py @@ -2,15 +2,25 @@ # Cura is released under the terms of the LGPLv3 or higher. import functools +import re + +# An API version must be a semantic version "x.y.z" where ".z" is optional. So the valid formats are as follows: +# - x.y.z +# - x.y +SEMANTIC_VERSION_REGEX = re.compile(r"^[0-9]+\.[0-9]+(\.[0-9]+)?$") ## Decorator for functions that belong to a set of APIs. For now, this should only be used for officially supported # APIs, meaning that those APIs should be versioned and maintained. # -# \param since The earliest version since when this API becomes supported. This means that since this version, this -# API function is supposed to behave the same. This parameter is not used. It's just a documentation. -# -def api(since = "Unknown"): +# \param since_version The earliest version since when this API becomes supported. This means that since this version, +# this API function is supposed to behave the same. This parameter is not used. It's just a +# documentation. +def api(since_version: str) -> callable: + # Make sure that APi versions are semantic versions + if not SEMANTIC_VERSION_REGEX.fullmatch(since_version): + raise ValueError("API since_version [%s] is not a semantic version." % since_version) + def api_decorator(function): @functools.wraps(function) def api_wrapper(*args, **kwargs): From a88887dbdb2b2068c0d0381c1fcf1c4e89ccbe78 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 23 Oct 2019 10:50:04 +0200 Subject: [PATCH 745/994] Change Backup (Drive) plugin version to 7.0 CURA-6858 --- plugins/CuraDrive/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraDrive/plugin.json b/plugins/CuraDrive/plugin.json index d1cab39ca5..9b9b3e2c15 100644 --- a/plugins/CuraDrive/plugin.json +++ b/plugins/CuraDrive/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Backup and restore your configuration.", "version": "1.2.0", - "api": 6, + "api": "7.0", "i18n-catalog": "cura" } From fe70cb23bf25933ee5d4d90fc5316de7f471bf02 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Oct 2019 11:01:01 +0200 Subject: [PATCH 746/994] Remove overrides that didn't have any effect This works due to our new test that tests for that case. A common failure case. --- resources/definitions/prusa_i3_mk3.def.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/definitions/prusa_i3_mk3.def.json b/resources/definitions/prusa_i3_mk3.def.json index 0b55e4f200..eddc1d88df 100644 --- a/resources/definitions/prusa_i3_mk3.def.json +++ b/resources/definitions/prusa_i3_mk3.def.json @@ -24,17 +24,14 @@ "machine_depth": { "default_value": 210 }, "machine_center_is_zero": { "default_value": false }, "material_diameter": { "default_value": 1.75 }, - "material_bed_temperature": { "default_value": 60 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height": { "default_value": 0.15 }, "layer_height_0": { "default_value": 0.2 }, "retraction_amount": { "default_value": 0.8 }, "retraction_speed": { "default_value": 35 }, - "retraction_retract_speed": { "default_value": 35 }, - "retraction_prime_speed": { "default_value": 35 }, "adhesion_type": { "default_value": "skirt" }, "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "default_value": 28 }, + "gantry_height": { "value": 28 }, "machine_max_feedrate_z": { "default_value": 12 }, "machine_max_feedrate_e": { "default_value": 120 }, "machine_max_acceleration_z": { "default_value": 500 }, From 5436e68ea4ed86b142272c2aa71c2fb43828d6c9 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 23 Oct 2019 15:29:54 +0200 Subject: [PATCH 747/994] Fix mypy warning CURA-6665 --- cura/Utils/Decorators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Utils/Decorators.py b/cura/Utils/Decorators.py index 52f61eb1f5..9275ee6ce9 100644 --- a/cura/Utils/Decorators.py +++ b/cura/Utils/Decorators.py @@ -3,6 +3,7 @@ import functools import re +from typing import Callable # An API version must be a semantic version "x.y.z" where ".z" is optional. So the valid formats are as follows: # - x.y.z @@ -16,7 +17,7 @@ SEMANTIC_VERSION_REGEX = re.compile(r"^[0-9]+\.[0-9]+(\.[0-9]+)?$") # \param since_version The earliest version since when this API becomes supported. This means that since this version, # this API function is supposed to behave the same. This parameter is not used. It's just a # documentation. -def api(since_version: str) -> callable: +def api(since_version: str) -> Callable: # Make sure that APi versions are semantic versions if not SEMANTIC_VERSION_REGEX.fullmatch(since_version): raise ValueError("API since_version [%s] is not a semantic version." % since_version) From 969b74e1f6e510b61903ab4d3fc8d26c84a598a2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 24 Oct 2019 10:59:37 +0200 Subject: [PATCH 748/994] Prevent crash when sync list somehow contains None I couldn't figure out how it could ever contain None, but we received logs from a user that indicate a crash here because that set contains None and that is not orderable. This is a hotfix to fail more gracefully instead of crashing the entire application. --- cura/PrinterOutput/PrinterOutputDevice.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index ae916e434b..ec682a1739 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -220,6 +220,9 @@ class PrinterOutputDevice(QObject, OutputDevice): if printer.printerConfiguration is not None and printer.printerConfiguration.hasAnyMaterialLoaded(): all_configurations.add(printer.printerConfiguration) all_configurations.update(printer.availableConfigurations) + if None in all_configurations: # Shouldn't happen, but it do. I don't see how it could ever happen. Skip adding that configuration. List could end up empty! + Logger.log("e", "Found a broken configuration in the synced list!") + all_configurations.remove(None) new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "") if new_configurations != self._unique_configurations: self._unique_configurations = new_configurations From 867283ffc3c77982829b8ab791f54e7a77a2b14d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 24 Oct 2019 13:23:44 +0200 Subject: [PATCH 749/994] Code style --- .../qml/MonitorPrintJobProgressBar.qml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 91f4accee1..0a478c8543 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -63,41 +63,41 @@ Item verticalCenter: parent.verticalCenter } color: UM.Theme.getColor("monitor_text_primary") - font: UM.Theme.getFont("default") // 12pt, regular + font: UM.Theme.getFont("default") text: { if (!printJob) { - return "" + return ""; } switch (printJob.state) { case "wait_cleanup": if (printJob.timeTotal > printJob.timeElapsed) { - return catalog.i18nc("@label:status", "Aborted") + return catalog.i18nc("@label:status", "Aborted"); } - return catalog.i18nc("@label:status", "Finished") + return catalog.i18nc("@label:status", "Finished"); case "finished": - return catalog.i18nc("@label:status", "Finished") + return catalog.i18nc("@label:status", "Finished"); case "sent_to_printer": - return catalog.i18nc("@label:status", "Preparing...") + return catalog.i18nc("@label:status", "Preparing..."); case "pre_print": - return catalog.i18nc("@label:status", "Preparing...") + return catalog.i18nc("@label:status", "Preparing..."); case "aborting": // NOTE: Doesn't exist but maybe should someday - return catalog.i18nc("@label:status", "Aborting...") + return catalog.i18nc("@label:status", "Aborting..."); case "aborted": // NOTE: Unused, see above - return catalog.i18nc("@label:status", "Aborted") + return catalog.i18nc("@label:status", "Aborted"); case "pausing": - return catalog.i18nc("@label:status", "Pausing...") + return catalog.i18nc("@label:status", "Pausing..."); case "paused": - return catalog.i18nc("@label:status", "Paused") + return catalog.i18nc("@label:status", "Paused"); case "resuming": - return catalog.i18nc("@label:status", "Resuming...") + return catalog.i18nc("@label:status", "Resuming..."); case "queued": - return catalog.i18nc("@label:status", "Action required") + return catalog.i18nc("@label:status", "Action required"); default: - return catalog.i18nc("@label:status", "Finishes %1 at %2".arg(OutputDevice.getDateCompleted( printJob.timeRemaining )).arg(OutputDevice.getTimeCompleted( printJob.timeRemaining ))) + return catalog.i18nc("@label:status", "Finishes %1 at %2".arg(OutputDevice.getDateCompleted(printJob.timeRemaining)).arg(OutputDevice.getTimeCompleted(printJob.timeRemaining))); } } width: contentWidth From d905b8b8cc4ae6ca169654db7c4d701905271887 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Oct 2019 15:55:49 +0200 Subject: [PATCH 750/994] Add extra reporting stage for splash screen CURA-6823 --- cura/CuraApplication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 8caccc786e..e5fe813bbd 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -517,7 +517,8 @@ class CuraApplication(QtApplication): with self._container_registry.lockFile(): self._container_registry.loadAllMetadata() - # set the setting version for Preferences + self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Setting up preferences...")) + # Set the setting version for Preferences preferences = self.getPreferences() preferences.addPreference("metadata/setting_version", 0) preferences.setValue("metadata/setting_version", self.SettingVersion) #Don't make it equal to the default so that the setting version always gets written to the file. From b3d7887d4d6b60a061a2fb7097a57a0988d15b26 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 12:08:16 +0200 Subject: [PATCH 751/994] fix luminance computation --- plugins/ImageReader/ImageReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index e720ce4854..c59151f1cb 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -99,8 +99,8 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - avg = float(qRed(qrgb) + qGreen(qrgb) + qBlue(qrgb)) / (3 * 255) - height_data[y, x] = avg + luminance = (0.2126 * qRed(qrgb) + 0.7152 * qGreen(qrgb) + 0.0722 * qBlue(qrgb)) / 255 # fast computation ignoring gamma + height_data[y, x] = luminance Job.yieldThread() From 88b424d36aa43d863a3e937187337af378905908 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 12:10:18 +0200 Subject: [PATCH 752/994] feat: use logarithmic conversion for lithophanes --- plugins/ImageReader/ConfigUI.qml | 22 ++++++++++++++++++++++ plugins/ImageReader/ImageReader.py | 16 ++++++++++++---- plugins/ImageReader/ImageReaderUI.py | 6 ++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 47ba10778c..ef28c174f2 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -143,6 +143,28 @@ UM.Dialog } } + UM.TooltipArea { + Layout.fillWidth:true + height: childrenRect.height + text: catalog.i18nc("@info:tooltip","For lithophanes a logarithmic function is more appropriate for most materials. For height maps the pixel values correspond to heights linearly.") + Row { + width: parent.width + + Label { + text: "Conversion" + width: 150 * screenScaleFactor + anchors.verticalCenter: parent.verticalCenter + } + ComboBox { + id: conversion + objectName: "Conversion" + model: [ catalog.i18nc("@item:inlistbox","Logarithmic"), catalog.i18nc("@item:inlistbox","Linear") ] + width: 180 * screenScaleFactor + onCurrentIndexChanged: { manager.onConvertFunctionChanged(currentIndex) } + } + } + } + UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index c59151f1cb..bfaa6eb48c 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -3,6 +3,8 @@ import numpy +import math + from PyQt5.QtGui import QImage, qRed, qGreen, qBlue from PyQt5.QtCore import Qt @@ -46,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function): scene_node = SceneNode() mesh = MeshBuilder() @@ -124,8 +126,14 @@ class ImageReader(MeshReader): Job.yieldThread() - height_data *= scale_vector.y - height_data += base_height + if use_logarithmic_function: + min_luminance = 2.0 ** (peak_height - base_height) + for (y, x) in numpy.ndindex(height_data.shape): + mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] + height_data[y, x] = peak_height - math.log(mapped_luminance, 2) + else: + height_data *= scale_vector.y + height_data += base_height heightmap_face_count = 2 * height_minus_one * width_minus_one total_face_count = heightmap_face_count + (width_minus_one * 2) * (height_minus_one * 2) + 2 diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 213468a2ab..c769a8c264 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -34,6 +34,7 @@ class ImageReaderUI(QObject): self.peak_height = 2.5 self.smoothing = 1 self.lighter_is_higher = False; + self.use_logarithmic_function = False; self._ui_lock = threading.Lock() self._cancelled = False @@ -144,3 +145,8 @@ class ImageReaderUI(QObject): @pyqtSlot(int) def onImageColorInvertChanged(self, value): self.lighter_is_higher = (value == 1) + + @pyqtSlot(int) + def onConvertFunctionChanged(self, value): + self.use_logarithmic_function = (value == 0) + From b88183f4a1f218b7c87d9ccd64a2fa1d95a68f9e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:18:07 +0200 Subject: [PATCH 753/994] fix translucency model using new permittance setting --- plugins/ImageReader/ConfigUI.qml | 23 +++++++++++++++++++++++ plugins/ImageReader/ImageReader.py | 9 +++++---- plugins/ImageReader/ImageReaderUI.py | 5 +++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index ef28c174f2..491594fa58 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -165,6 +165,29 @@ UM.Dialog } } + UM.TooltipArea { + Layout.fillWidth:true + height: childrenRect.height + text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter.") + Row { + width: parent.width + + Label { + text: catalog.i18nc("@action:label", "1mm Transmittance (%)") + width: 150 * screenScaleFactor + anchors.verticalCenter: parent.verticalCenter + } + TextField { + id: transmittance + objectName: "Transmittance" + focus: true + validator: RegExpValidator {regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/} + width: 180 * screenScaleFactor + onTextChanged: { manager.onTransmittanceChanged(text) } + } + } + } + UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index bfaa6eb48c..ce3cab0b8f 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -48,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function, self._ui.transmittance_1mm) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function, transmittance_1mm): scene_node = SceneNode() mesh = MeshBuilder() @@ -127,10 +127,11 @@ class ImageReader(MeshReader): Job.yieldThread() if use_logarithmic_function: - min_luminance = 2.0 ** (peak_height - base_height) + p = 1.0 / math.log(transmittance_1mm / 100.0, 2) + min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = peak_height - math.log(mapped_luminance, 2) + height_data[y, x] = peak_height - p * math.log(mapped_luminance, 2) else: height_data *= scale_vector.y height_data += base_height diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index c769a8c264..67d6444538 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,6 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_logarithmic_function = False; + self.transmittance_1mm = 40.0; self._ui_lock = threading.Lock() self._cancelled = False @@ -76,6 +77,7 @@ class ImageReaderUI(QObject): self._ui_view.findChild(QObject, "Base_Height").setProperty("text", str(self.base_height)) self._ui_view.findChild(QObject, "Peak_Height").setProperty("text", str(self.peak_height)) + self._ui_view.findChild(QObject, "Transmittance").setProperty("text", str(self.transmittance_1mm)) self._ui_view.findChild(QObject, "Smoothing").setProperty("value", self.smoothing) def _createConfigUI(self): @@ -150,3 +152,6 @@ class ImageReaderUI(QObject): def onConvertFunctionChanged(self, value): self.use_logarithmic_function = (value == 0) + @pyqtSlot(int) + def onTransmittanceChanged(self, value): + self.transmittance_1mm = value From 2b55b85a1234791babf7700a362c940d4ca42473 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:21:05 +0200 Subject: [PATCH 754/994] fix luminance computation --- plugins/ImageReader/ImageReader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index ce3cab0b8f..50825f2464 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -101,8 +101,10 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - luminance = (0.2126 * qRed(qrgb) + 0.7152 * qGreen(qrgb) + 0.0722 * qBlue(qrgb)) / 255 # fast computation ignoring gamma - height_data[y, x] = luminance + if use_logarithmic_function: + height_data[y, x] = (0.299 * math.pow(qRed(qrgb) / 255.0, 2.2) + 0.587 * math.pow(qGreen(qrgb) / 255.0, 2.2) + 0.114 * math.pow(qBlue(qrgb) / 255.0, 2.2)) + else: + height_data[y, x] = (0.212655 * qRed(qrgb) + 0.715158 * qGreen(qrgb) + 0.072187 * qBlue(qrgb)) / 255 # fast computation ignoring gamma and degamma Job.yieldThread() From a8b3d7e49ddcbc33df41dd6c4ec71b619511b966 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:27:51 +0200 Subject: [PATCH 755/994] make naming of Logarithmic Conversion Function intelligible --- plugins/ImageReader/ConfigUI.qml | 12 ++++++------ plugins/ImageReader/ImageReader.py | 8 ++++---- plugins/ImageReader/ImageReaderUI.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 491594fa58..8a4ac67b3e 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -146,21 +146,21 @@ UM.Dialog UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height - text: catalog.i18nc("@info:tooltip","For lithophanes a logarithmic function is more appropriate for most materials. For height maps the pixel values correspond to heights linearly.") + text: catalog.i18nc("@info:tooltip","For lithophanes a simple logarithmic model for translucency is available. For height maps the pixel values correspond to heights linearly.") Row { width: parent.width Label { - text: "Conversion" + text: "Color Model" width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } ComboBox { - id: conversion - objectName: "Conversion" - model: [ catalog.i18nc("@item:inlistbox","Logarithmic"), catalog.i18nc("@item:inlistbox","Linear") ] + id: color_model + objectName: "ColorModel" + model: [ catalog.i18nc("@item:inlistbox","Translucency"), catalog.i18nc("@item:inlistbox","Linear") ] width: 180 * screenScaleFactor - onCurrentIndexChanged: { manager.onConvertFunctionChanged(currentIndex) } + onCurrentIndexChanged: { manager.onColorModelChanged(currentIndex) } } } } diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 50825f2464..0086736f6d 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -48,9 +48,9 @@ class ImageReader(MeshReader): def _read(self, file_name): size = max(self._ui.getWidth(), self._ui.getDepth()) - return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_logarithmic_function, self._ui.transmittance_1mm) + return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_transparency_model, self._ui.transmittance_1mm) - def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_logarithmic_function, transmittance_1mm): + def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_transparency_model, transmittance_1mm): scene_node = SceneNode() mesh = MeshBuilder() @@ -101,7 +101,7 @@ class ImageReader(MeshReader): for x in range(0, width): for y in range(0, height): qrgb = img.pixel(x, y) - if use_logarithmic_function: + if use_transparency_model: height_data[y, x] = (0.299 * math.pow(qRed(qrgb) / 255.0, 2.2) + 0.587 * math.pow(qGreen(qrgb) / 255.0, 2.2) + 0.114 * math.pow(qBlue(qrgb) / 255.0, 2.2)) else: height_data[y, x] = (0.212655 * qRed(qrgb) + 0.715158 * qGreen(qrgb) + 0.072187 * qBlue(qrgb)) / 255 # fast computation ignoring gamma and degamma @@ -128,7 +128,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if use_logarithmic_function: + if use_transparency_model: p = 1.0 / math.log(transmittance_1mm / 100.0, 2) min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 67d6444538..41d8741b38 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -34,7 +34,7 @@ class ImageReaderUI(QObject): self.peak_height = 2.5 self.smoothing = 1 self.lighter_is_higher = False; - self.use_logarithmic_function = False; + self.use_transparency_model = True; self.transmittance_1mm = 40.0; self._ui_lock = threading.Lock() @@ -149,8 +149,8 @@ class ImageReaderUI(QObject): self.lighter_is_higher = (value == 1) @pyqtSlot(int) - def onConvertFunctionChanged(self, value): - self.use_logarithmic_function = (value == 0) + def onColorModelChanged(self, value): + self.use_transparency_model = (value == 0) @pyqtSlot(int) def onTransmittanceChanged(self, value): From 364483f6533905b710b5c2d8f2ff3d77b5d73598 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:37:14 +0200 Subject: [PATCH 756/994] explain litho transmittance better --- plugins/ImageReader/ConfigUI.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 8a4ac67b3e..842ca612d9 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -168,7 +168,7 @@ UM.Dialog UM.TooltipArea { Layout.fillWidth:true height: childrenRect.height - text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter.") + text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter. Lowering this value increases the contrast in dark regions and decreases the contrast in light regions of the image.") Row { width: parent.width From 5915947a7a54502b48367a9ba5e47e5888d5351b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 14:55:10 +0200 Subject: [PATCH 757/994] fix litho thickness computation --- plugins/ImageReader/ImageReader.py | 4 ++-- plugins/ImageReader/ImageReaderUI.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 0086736f6d..2084844548 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -108,7 +108,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if not lighter_is_higher: + if lighter_is_higher is use_transparency_model: height_data = 1 - height_data for _ in range(0, blur_iterations): @@ -133,7 +133,7 @@ class ImageReader(MeshReader): min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = peak_height - p * math.log(mapped_luminance, 2) + height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) else: height_data *= scale_vector.y height_data += base_height diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 41d8741b38..0fb9ea78de 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,7 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_transparency_model = True; - self.transmittance_1mm = 40.0; + self.transmittance_1mm = 20.0; # based on pearl PLA self._ui_lock = threading.Lock() self._cancelled = False From 449ad198225bb3df6c68a699b71e02660ad233ba Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 20 May 2019 20:19:29 +0200 Subject: [PATCH 758/994] based transmittance on measurements on print ratio of luminance of 1.4mm thickness to luminance at 0.4mm --- plugins/ImageReader/ImageReaderUI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 0fb9ea78de..a61fabb742 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,7 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_transparency_model = True; - self.transmittance_1mm = 20.0; # based on pearl PLA + self.transmittance_1mm = 50.0; # based on pearl PLA self._ui_lock = threading.Lock() self._cancelled = False From 03f7fab1247cd50ea409a4129feb0b92174ca402 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Oct 2019 17:26:20 +0200 Subject: [PATCH 759/994] lil fix --- plugins/ImageReader/ImageReader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 2084844548..a77cc9b0ed 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -108,7 +108,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if lighter_is_higher is use_transparency_model: + if lighter_is_higher == use_transparency_model: height_data = 1 - height_data for _ in range(0, blur_iterations): @@ -129,11 +129,11 @@ class ImageReader(MeshReader): Job.yieldThread() if use_transparency_model: - p = 1.0 / math.log(transmittance_1mm / 100.0, 2) + p = 1.0 / math.log(transmittance_1mm / 100.0, 2) # base doesn't matter here. use base 2 for fast computation min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) + height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) # use same base as a couple lines above this else: height_data *= scale_vector.y height_data += base_height From 7780d76eb6f840c40f1ef95b9fa45c4b47bb48a2 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 24 Oct 2019 17:31:53 +0200 Subject: [PATCH 760/994] Intiial work on 'Singing of Plugins and Material Packages'. Most of the work is in Uranium right now -- especially since the plugins part is picked up first, and there are already plugins at Uraniums level. part of CURA-6856 --- cura/ApplicationMetadata.py | 5 +++++ cura/CuraApplication.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index daa937197c..25be4b31e9 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -42,6 +42,11 @@ try: except ImportError: CuraDebugMode = DEFAULT_CURA_DEBUG_MODE +try: + from cura.CuraVersion import CuraIsEnterpriseVersion # type: ignore +except ImportError: + CuraIsEnterpriseVersion = True # (DEFAULT_CURA_BUILD_TYPE != "") + # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 8caccc786e..9c2fd1b931 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -719,6 +719,8 @@ class CuraApplication(QtApplication): ## Handle loading of all plugin types (and the backend explicitly) # \sa PluginRegistry def _loadPlugins(self) -> None: + self._plugin_registry.setCheckIfTrusted(ApplicationMetadata.CuraIsEnterpriseVersion) + self._plugin_registry.addType("profile_reader", self._addProfileReader) self._plugin_registry.addType("profile_writer", self._addProfileWriter) From 6e65fe57727acf62cf8669557d7242b1ab9a1059 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 25 Oct 2019 09:57:39 +0200 Subject: [PATCH 761/994] Only show the transmittance input when the color model is Translucency CURA-6540 --- plugins/ImageReader/ConfigUI.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 842ca612d9..72ad79c05e 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -169,6 +169,7 @@ UM.Dialog Layout.fillWidth:true height: childrenRect.height text: catalog.i18nc("@info:tooltip","The percentage of light penetrating a print with a thickness of 1 millimeter. Lowering this value increases the contrast in dark regions and decreases the contrast in light regions of the image.") + visible: color_model.currentText == catalog.i18nc("@item:inlistbox","Translucency") Row { width: parent.width From e805c3db059a16dba7cf7dcd8082203fe9825935 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 11:05:38 +0200 Subject: [PATCH 762/994] Ensure material is selected on first opening of material manager --- resources/qml/Preferences/Materials/MaterialsPage.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index fcfe5749e0..d635b2b721 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -53,7 +53,11 @@ Item } // When loaded, try to select the active material in the tree - Component.onCompleted: resetExpandedActiveMaterial() + Component.onCompleted: + { + resetExpandedActiveMaterial() + base.newRootMaterialIdToSwitchTo = active_root_material_id + } // Every time the selected item has changed, notify to the details panel onCurrentItemChanged: From 3491900bf189b115e110da343935bd9c7d7d7083 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 11:06:01 +0200 Subject: [PATCH 763/994] Fix grammar in a comment --- cura/PrinterOutput/PrinterOutputDevice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index ec682a1739..b05e76ad2e 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -220,7 +220,7 @@ class PrinterOutputDevice(QObject, OutputDevice): if printer.printerConfiguration is not None and printer.printerConfiguration.hasAnyMaterialLoaded(): all_configurations.add(printer.printerConfiguration) all_configurations.update(printer.availableConfigurations) - if None in all_configurations: # Shouldn't happen, but it do. I don't see how it could ever happen. Skip adding that configuration. List could end up empty! + if None in all_configurations: # Shouldn't happen, but it does. I don't see how it could ever happen. Skip adding that configuration. List could end up empty! Logger.log("e", "Found a broken configuration in the synced list!") all_configurations.remove(None) new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "") From 76a538322dba877cc520224932daf6fa93b12d03 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 25 Oct 2019 10:36:20 +0200 Subject: [PATCH 764/994] simplify formula to make it more numerically stable --- plugins/ImageReader/ImageReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index a77cc9b0ed..babd9f45cb 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -130,7 +130,7 @@ class ImageReader(MeshReader): if use_transparency_model: p = 1.0 / math.log(transmittance_1mm / 100.0, 2) # base doesn't matter here. use base 2 for fast computation - min_luminance = 2.0 ** ((peak_height - base_height) / p) + min_luminance = (transmittance_1mm / 100.0) ** (peak_height - base_height) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) # use same base as a couple lines above this From a01f91d4e366d1d1dbec2eb04ceb0e8f6398550d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 25 Oct 2019 10:36:55 +0200 Subject: [PATCH 765/994] omit irrelevant log base --- plugins/ImageReader/ImageReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index babd9f45cb..9bcd245615 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -129,11 +129,11 @@ class ImageReader(MeshReader): Job.yieldThread() if use_transparency_model: - p = 1.0 / math.log(transmittance_1mm / 100.0, 2) # base doesn't matter here. use base 2 for fast computation + p = 1.0 / math.log(transmittance_1mm / 100.0) # log-base doesn't matter here. Precompute this value for faster computation of each pixel. min_luminance = (transmittance_1mm / 100.0) ** (peak_height - base_height) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) # use same base as a couple lines above this + height_data[y, x] = base_height + p * math.log(mapped_luminance) # use same base as a couple lines above this else: height_data *= scale_vector.y height_data += base_height From 1c134026706d270041a7e97d043cc6d93f505dfb Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 25 Oct 2019 10:38:23 +0200 Subject: [PATCH 766/994] rename single letter variable --- plugins/ImageReader/ImageReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 9bcd245615..d6c2827d16 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -129,11 +129,11 @@ class ImageReader(MeshReader): Job.yieldThread() if use_transparency_model: - p = 1.0 / math.log(transmittance_1mm / 100.0) # log-base doesn't matter here. Precompute this value for faster computation of each pixel. + divisor = 1.0 / math.log(transmittance_1mm / 100.0) # log-base doesn't matter here. Precompute this value for faster computation of each pixel. min_luminance = (transmittance_1mm / 100.0) ** (peak_height - base_height) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = base_height + p * math.log(mapped_luminance) # use same base as a couple lines above this + height_data[y, x] = base_height + divisor * math.log(mapped_luminance) # use same base as a couple lines above this else: height_data *= scale_vector.y height_data += base_height From 8198762755bbb7958d6e20ef38145b9eb1e230f2 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 23 Oct 2019 17:25:05 +0200 Subject: [PATCH 767/994] Do not require loaded view in PrevieStage to have a safeArea CURA-6853 --- plugins/PreviewStage/PreviewMain.qml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 1b8387644d..4ef10e5dbb 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -29,11 +29,10 @@ Item source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : "" - Binding - { - target: previewMain.item - property: "safeArea" - value:safeArea + onLoaded: { + if (previewMain.item.safeArea !== undefined){ + previewMain.item.safeArea = Qt.binding(function() { return safeArea }); + } } } From 9a3ff527acf9b025563e70d01059801668e629d1 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 25 Oct 2019 12:25:41 +0200 Subject: [PATCH 768/994] Bring back the printer selection dialog for networked printers --- .../Models/PrinterOutputModel.py | 10 +++ .../resources/qml/PrintWindow.qml | 70 ++++++++----------- .../src/Models/Http/ClusterPrinterStatus.py | 1 + .../src/Network/LocalClusterOutputDevice.py | 41 ++++++++++- 4 files changed, 80 insertions(+), 42 deletions(-) diff --git a/cura/PrinterOutput/Models/PrinterOutputModel.py b/cura/PrinterOutput/Models/PrinterOutputModel.py index a1a23201fb..37135bf663 100644 --- a/cura/PrinterOutput/Models/PrinterOutputModel.py +++ b/cura/PrinterOutput/Models/PrinterOutputModel.py @@ -35,6 +35,7 @@ class PrinterOutputModel(QObject): self._target_bed_temperature = 0 # type: float self._name = "" self._key = "" # Unique identifier + self._unique_name = "" # Unique name (used in Connect) self._controller = output_controller self._controller.canUpdateFirmwareChanged.connect(self._onControllerCanUpdateFirmwareChanged) self._extruders = [ExtruderOutputModel(printer = self, position = i) for i in range(number_of_extruders)] @@ -190,6 +191,15 @@ class PrinterOutputModel(QObject): self._name = name self.nameChanged.emit() + @pyqtProperty(str, notify = nameChanged) + def uniqueName(self) -> str: + return self._unique_name + + def updateUniqueName(self, unique_name: str) -> None: + if self._unique_name != unique_name: + self._unique_name = unique_name + self.nameChanged.emit() + ## Update the bed temperature. This only changes it locally. def updateBedTemperature(self, temperature: float) -> None: if self._bed_temperature != temperature: diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index bcba60352c..6d9f375788 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -1,52 +1,57 @@ // Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. - import QtQuick 2.2 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 import UM 1.1 as UM UM.Dialog { + id: base; + title: catalog.i18nc("@title:window", "Print over network"); + width: minimumWidth; height: minimumHeight; - leftButtons: [ - Button { - enabled: true; - onClicked: { - base.visible = false; - printerSelectionCombobox.currentIndex = 0; - OutputDevice.cancelPrintSelection(); - } - text: catalog.i18nc("@action:button","Cancel"); - } - ] maximumHeight: minimumHeight; maximumWidth: minimumWidth; minimumHeight: 140 * screenScaleFactor; minimumWidth: 500 * screenScaleFactor; modality: Qt.ApplicationModal; - onVisibleChanged: { - if (visible) { - resetPrintersModel(); - } else { - OutputDevice.cancelPrintSelection(); + + Component.onCompleted: { + populateComboBox() + } + + // populates the combo box with the correct printer values + function populateComboBox() { + comboBoxPrintersModel.clear(); + comboBoxPrintersModel.append({ name: "Automatic", key: "" }); // Connect will just do it's thing + for (var i in OutputDevice.printers) { + comboBoxPrintersModel.append({ + name: OutputDevice.printers[i].name, + key: OutputDevice.printers[i].uniqueName + }); } } + + leftButtons: [ + Button { + enabled: true; + onClicked: { + base.close(); + } + text: catalog.i18nc("@action:button","Cancel"); + } + ] rightButtons: [ Button { enabled: true; onClicked: { - base.visible = false; - OutputDevice.selectPrinter(printerSelectionCombobox.model.get(printerSelectionCombobox.currentIndex).key); - // reset to defaults - printerSelectionCombobox.currentIndex = 0; + OutputDevice.selectTargetPrinter(printerComboBox.model.get(printerComboBox.currentIndex).key); + base.close(); } text: catalog.i18nc("@action:button","Print"); } ] - title: catalog.i18nc("@title:window", "Print over network"); - visible: true; - width: minimumWidth; Column { id: printerSelection; @@ -59,10 +64,6 @@ UM.Dialog { } height: 50 * screenScaleFactor; - SystemPalette { - id: palette; - } - UM.I18nCatalog { id: catalog; name: "cura"; @@ -82,23 +83,14 @@ UM.Dialog { } ComboBox { - id: printerSelectionCombobox; + id: printerComboBox; Behavior on height { NumberAnimation { duration: 100 } } height: 40 * screenScaleFactor; model: ListModel { - id: printersModel; + id: comboBoxPrintersModel; } textRole: "name"; width: parent.width; } } - - // Utils - function resetPrintersModel() { - printersModel.clear(); - printersModel.append({ name: "Automatic", key: ""}); - for (var index in OutputDevice.printers) { - printersModel.append({name: OutputDevice.printers[index].name, key: OutputDevice.printers[index].key}); - } - } } diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py index 69daa1f08b..2e0912f057 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py @@ -79,6 +79,7 @@ class ClusterPrinterStatus(BaseModel): def updateOutputModel(self, model: PrinterOutputModel) -> None: model.updateKey(self.uuid) model.updateName(self.friendly_name) + model.updateUniqueName(self.unique_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") model.updateBuildplate(self.build_plate.type if self.build_plate else "glass") diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py index dd9c0a7d2a..9e368c73b3 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -1,16 +1,17 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - +import os from typing import Optional, Dict, List, Callable, Any from PyQt5.QtGui import QDesktopServices -from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty +from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject from PyQt5.QtNetwork import QNetworkReply from UM.FileHandler.FileHandler import FileHandler from UM.i18n import i18nCatalog from UM.Logger import Logger from UM.Scene.SceneNode import SceneNode +from cura.CuraApplication import CuraApplication from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState from cura.PrinterOutput.PrinterOutputDevice import ConnectionType @@ -42,6 +43,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): ) self._cluster_api = None # type: Optional[ClusterApiClient] + self._active_exported_job = None # type: Optional[ExportFileJob] + self._printer_select_dialog = None # type: Optional[QObject] # We don't have authentication over local networking, so we're always authenticated. self.setAuthenticationState(AuthState.Authenticated) @@ -129,17 +132,49 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): job.finished.connect(self._onPrintJobCreated) job.start() + ## Allows the user to choose a printer to print with from the printer selection dialogue. + # \param unique_name: The unique name of the printer to target. + @pyqtSlot(str, name="selectTargetPrinter") + def selectTargetPrinter(self, unique_name: str = "") -> None: + self._startPrintJobUpload(unique_name if unique_name != "" else None) + ## Handler for when the print job was created locally. # It can now be sent over the network. def _onPrintJobCreated(self, job: ExportFileJob) -> None: + self._active_exported_job = job + # TODO: add preference to enable/disable this feature? + if self.clusterSize > 1: + self._showPrinterSelectionDialog() # self._startPrintJobUpload will be triggered from this dialog + return + self._startPrintJobUpload() + + ## Shows a dialog allowing the user to select which printer in a group to send a job to. + def _showPrinterSelectionDialog(self) -> None: + if not self._printer_select_dialog: + path = os.path.join(CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting"), + "resources", "qml", "PrintWindow.qml") + self._printer_select_dialog = CuraApplication.getInstance().createQmlComponent(path, {"OutputDevice": self}) + self._printer_select_dialog.show() + + ## Upload the print job to the group. + def _startPrintJobUpload(self, unique_name: str = None) -> None: + if not self._active_exported_job: + Logger.log("e", "No active exported job to upload!") + return self._progress.show() parts = [ self._createFormPart("name=owner", bytes(self._getUserName(), "utf-8"), "text/plain"), - self._createFormPart("name=\"file\"; filename=\"%s\"" % job.getFileName(), job.getOutput()) + self._createFormPart("name=\"file\"; filename=\"%s\"" % self._active_exported_job.getFileName(), + self._active_exported_job.getOutput()) ] + # If a specific printer was selected we include the name in the request. + # FIXME: Connect should allow the printer UUID here instead of the 'unique_name'. + if unique_name is not None: + parts.append(self._createFormPart("name=require_printer_name", bytes(unique_name, "utf-8"), "text/plain")) # FIXME: move form posting to API client self.postFormWithParts("/cluster-api/v1/print_jobs/", parts, on_finished=self._onPrintUploadCompleted, on_progress=self._onPrintJobUploadProgress) + self._active_exported_job = None ## Handler for print job upload progress. def _onPrintJobUploadProgress(self, bytes_sent: int, bytes_total: int) -> None: From 8f46c02e5d32448422b0d74210d7150b5718e2c0 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 25 Oct 2019 12:35:03 +0200 Subject: [PATCH 769/994] Fix MyPy issues --- .../src/Network/LocalClusterOutputDevice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py index 9e368c73b3..1266afcca8 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -151,10 +151,11 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): ## Shows a dialog allowing the user to select which printer in a group to send a job to. def _showPrinterSelectionDialog(self) -> None: if not self._printer_select_dialog: - path = os.path.join(CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting"), - "resources", "qml", "PrintWindow.qml") + plugin_path = CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting") or "" + path = os.path.join(plugin_path, "resources", "qml", "PrintWindow.qml") self._printer_select_dialog = CuraApplication.getInstance().createQmlComponent(path, {"OutputDevice": self}) - self._printer_select_dialog.show() + if self._printer_select_dialog is not None: + self._printer_select_dialog.show() ## Upload the print job to the group. def _startPrintJobUpload(self, unique_name: str = None) -> None: From c332c7debcb1616d3dd089595837b9eee6a1577e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 Oct 2019 13:02:19 +0200 Subject: [PATCH 770/994] Improve issue templates Two major changes here: 1. No longer include the instructions in comments. Quite often the filled in template was also in comments then because people don't know the HTML formatting. Also if the template is not completely filled in now, public shaming ensues. 2. The reproduce steps for bugs now suggest a numbered list of steps. Hopefully this will improve the bug reports we get with better reproduction steps. --- .github/ISSUE_TEMPLATE.md | 23 ++++++++++++----------- .github/ISSUE_TEMPLATE/bug-report.md | 15 ++++++++------- .github/ISSUE_TEMPLATE/feature_request.md | 11 ++++++----- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2f880a9e32..8e56787aeb 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -11,23 +11,24 @@ Information about how to find the log file can be found at https://github.com/Ul Thank you for using Cura! --> -**Application Version** - +**Application version** +(The version of the application this issue occurs with.) **Platform** - +(Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) **Printer** - +(Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.) -**Steps to Reproduce** - +**Reproduction steps** +1. Something you did. +2. Something you did next. -**Actual Results** - +**Actual results** +(What happens after the above steps have been followed.) **Expected results** - +(What should happen after the above steps have been followed.) -**Additional Information** - +**Additional information** +(Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index a7371e02a6..749b8037c1 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -22,22 +22,23 @@ Thank you for using Cura! --> **Application version** - +(The version of the application this issue occurs with.) **Platform** - +(Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) **Printer** - +(Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.) **Reproduction steps** - +1. Something you did. +2. Something you did next. **Actual results** - +(What happens after the above steps have been followed.) **Expected results** - +(What should happen after the above steps have been followed.) **Additional information** - +(Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 2a0a3e4e7b..a10d664a04 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -8,15 +8,16 @@ assignees: '' --- **Is your feature request related to a problem? Please describe.** - +(A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]) **Describe the solution you'd like** - +(A clear and concise description of what you want to happen. If possible, describe why you think this is a good solution.) **Describe alternatives you've considered** - +(A clear and concise description of any alternative solutions or features you've considered. Again, if possible, think about why these alternatives are not working out.) **Affected users and/or printers** - +(Who do you think will benefit from this? Is everyone going to benefit from these changes? Or specific kinds of users?) + **Additional context** - +(Add any other context or screenshots about the feature request here.) From 2abb9842d2ed75ca587fb7ed980bc5b7154f63a8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 Oct 2019 13:21:18 +0200 Subject: [PATCH 771/994] Choose a supported quality as preferred quality One that is supported by the preferred material and nozzle. As discussed in #6474. --- resources/definitions/strateo3d.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 4bf4e19aa4..2ee3650404 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -14,7 +14,7 @@ "has_variants": true, "preferred_variant_name": "Standard 0.6", "preferred_material": "emotiontech_pla", - "preferred_quality_type": "e", + "preferred_quality_type": "c", "variants_name": "Print Head", "machine_extruder_trains": { From 98275d2da056a6e3a0feabcf663d101bc1340bd5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 13:44:55 +0200 Subject: [PATCH 772/994] Create first start model on demand So if we don't use it, we don't spend any time on it. --- cura/CuraApplication.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e5fe813bbd..4ce8eadaf8 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -224,7 +224,7 @@ class CuraApplication(QtApplication): self._quality_management_model = None self._discovered_printer_model = DiscoveredPrintersModel(self, parent = self) - self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self) + self._first_start_machine_actions_model = None self._welcome_pages_model = WelcomePagesModel(self, parent = self) self._add_printer_pages_model = AddPrinterPagesModel(self, parent = self) self._whats_new_pages_model = WhatsNewPagesModel(self, parent = self) @@ -878,6 +878,8 @@ class CuraApplication(QtApplication): @pyqtSlot(result = QObject) def getFirstStartMachineActionsModel(self, *args) -> "FirstStartMachineActionsModel": + if self._first_start_machine_actions_model is None: + self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self) return self._first_start_machine_actions_model @pyqtSlot(result = QObject) From 11bf91ae388fcea4325dc1a5d9880b8c10632252 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 13:52:45 +0200 Subject: [PATCH 773/994] Prevent type coercion in qml This should speed things up a tiny bit --- resources/qml/Settings/SettingView.qml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index c2f23a6f1d..c917badb42 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -228,7 +228,7 @@ Item model: UM.SettingDefinitionsModel { id: definitionsModel - containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: "" + containerId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.definition.id: "" visibilityHandler: UM.SettingPreferenceVisibilityHandler { } exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "cutting_mesh", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false. expanded: CuraApplication.expandedCategories @@ -244,40 +244,40 @@ Item onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate() } - property var indexWithFocus: -1 + property int indexWithFocus: -1 delegate: Loader { id: delegate width: scrollView.width - height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : - contents.spacing + height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height : - contents.spacing Behavior on height { NumberAnimation { duration: 100 } } - opacity: provider.properties.enabled == "True" ? 1 : 0 + opacity: provider.properties.enabled === "True" ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } } enabled: { if (!Cura.ExtruderManager.activeExtruderStackId && machineExtruderCount.properties.value > 1) { // disable all controls on the global tab, except categories - return model.type == "category" + return model.type === "category" } - return provider.properties.enabled == "True" + return provider.properties.enabled === "True" } property var definition: model property var settingDefinitionsModel: definitionsModel property var propertyProvider: provider property var globalPropertyProvider: inheritStackProvider - property var externalResetHandler: false + property bool externalResetHandler: false property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : "" //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989 //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes, //causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely. - asynchronous: model.type != "enum" && model.type != "extruder" && model.type != "optional_extruder" - active: model.type != undefined + asynchronous: model.type !== "enum" && model.type !== "extruder" && model.type !== "optional_extruder" + active: model.type !== undefined source: { @@ -313,7 +313,7 @@ Item { target: provider property: "containerStackId" - when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0); + when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder !== null && inheritStackProvider.properties.limit_to_extruder >= 0); value: { // Associate this binding with Cura.MachineManager.activeMachine.id in the beginning so this @@ -326,7 +326,7 @@ Item //Not settable per extruder or there only is global, so we must pick global. return delegate.activeMachineId } - if (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0) + if (inheritStackProvider.properties.limit_to_extruder !== null && inheritStackProvider.properties.limit_to_extruder >= 0) { //We have limit_to_extruder, so pick that stack. return Cura.ExtruderManager.extruderIds[String(inheritStackProvider.properties.limit_to_extruder)]; @@ -359,7 +359,7 @@ Item key: model.key ? model.key : "" watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ] storeIndex: 0 - removeUnusedValue: model.resolve == undefined + removeUnusedValue: model.resolve === undefined } Connections @@ -465,7 +465,7 @@ Item //: Settings context menu action text: catalog.i18nc("@action:menu", "Copy value to all extruders") visible: machineExtruderCount.properties.value > 1 - enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False" + enabled: contextMenu.provider !== undefined && contextMenu.provider.properties.settable_per_extruder !== "False" onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key) } @@ -474,7 +474,7 @@ Item //: Settings context menu action text: catalog.i18nc("@action:menu", "Copy all changed values to all extruders") visible: machineExtruderCount.properties.value > 1 - enabled: contextMenu.provider != undefined + enabled: contextMenu.provider !== undefined onTriggered: Cura.MachineManager.copyAllValuesToExtruders() } From 0168a1d5e0fe3b395952fac673d16f7f9a0a22e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 Oct 2019 14:12:55 +0200 Subject: [PATCH 774/994] Don't output to stderr if there is no stderr This can happen on Windows where the default command line doesn't have a stderr channel. Put it in stdout then. Fixes #6579. --- cura_app.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura_app.py b/cura_app.py index 080479ee92..e14b4410bc 100755 --- a/cura_app.py +++ b/cura_app.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import argparse @@ -131,7 +131,10 @@ def exceptHook(hook_type, value, traceback): # Set exception hook to use the crash dialog handler sys.excepthook = exceptHook # Enable dumping traceback for all threads -faulthandler.enable(all_threads = True) +if sys.stderr: + faulthandler.enable(file = sys.stderr, all_threads = True) +else: + faulthandler.enable(file = sys.stdout, all_threads = True) # Workaround for a race condition on certain systems where there # is a race condition between Arcus and PyQt. Importing Arcus From 624b8d87417ae55f050fdd2d194750ee84255b80 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 14:28:09 +0200 Subject: [PATCH 775/994] Prevent unneeded re-evaluation of ActiveMachine ID property --- resources/qml/Settings/SettingView.qml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index c917badb42..20e9af59db 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -245,7 +245,7 @@ Item } property int indexWithFocus: -1 - + property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : "" delegate: Loader { id: delegate @@ -271,8 +271,6 @@ Item property var globalPropertyProvider: inheritStackProvider property bool externalResetHandler: false - property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : "" - //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989 //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes, //causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely. @@ -324,7 +322,7 @@ Item if (!model.settable_per_extruder) { //Not settable per extruder or there only is global, so we must pick global. - return delegate.activeMachineId + return contents.activeMachineId } if (inheritStackProvider.properties.limit_to_extruder !== null && inheritStackProvider.properties.limit_to_extruder >= 0) { @@ -337,7 +335,7 @@ Item return Cura.ExtruderManager.activeExtruderStackId; } //No extruder tab is selected. Pick the global stack. Shouldn't happen any more since we removed the global tab. - return delegate.activeMachineId + return contents.activeMachineId } } @@ -346,7 +344,7 @@ Item UM.SettingPropertyProvider { id: inheritStackProvider - containerStackId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id: "" + containerStackId: contents.activeMachineId key: model.key watchedProperties: [ "limit_to_extruder" ] } @@ -355,7 +353,7 @@ Item { id: provider - containerStackId: delegate.activeMachineId + containerStackId: contents.activeMachineId key: model.key ? model.key : "" watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ] storeIndex: 0 From 9430d05cac522fb1953cb134cf603bcd4db6ad6c Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 25 Oct 2019 15:06:33 +0200 Subject: [PATCH 776/994] WIP: center path slider between view controls and action panel CURA-6874 --- plugins/PreviewStage/PreviewMain.qml | 31 +++++++++++++------ .../SimulationViewMainComponent.qml | 22 ++++++++++--- resources/qml/Cura.qml | 17 ++++++++++ 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 4ef10e5dbb..0b93dea0af 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -12,14 +12,26 @@ import Cura 1.0 as Cura Item { + // An Item whose bounds are guaranteed to be safe for overlays to be placed. + // Defaults to parent, ie. the entire available area + property var safeArea: parent + // Subtract the actionPanel from the safe area. This way the view won't draw interface elements under/over it - Item { - id: safeArea - visible: false - anchors.left: parent.left - anchors.right: actionPanelWidget.left - anchors.top: parent.top - anchors.bottom: actionPanelWidget.top + Rectangle + { + id: childSafeArea + x: safeArea.x - parent.x + y: safeArea.y - parent.y + width: actionPanelWidget.x - x + height: actionPanelWidget.y - y + visible: true // true for debug only + color:"#800000FF" + + Component.onCompleted: { + print("parent", parent.x, parent.y) + print("parent safe", safeArea.x, safeArea.y) + print("previewmain safe", childSafeArea.x, childSafeArea.y, childSafeArea.width, childSafeArea.height) + } } Loader @@ -29,9 +41,10 @@ Item source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : "" - onLoaded: { + onLoaded: + { if (previewMain.item.safeArea !== undefined){ - previewMain.item.safeArea = Qt.binding(function() { return safeArea }); + previewMain.item.safeArea = Qt.binding(function() { return childSafeArea }); } } } diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index cd7d108370..0cd2027dfa 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -18,7 +18,10 @@ Item property bool isSimulationPlaying: false + readonly property var layerSliderSafeYMin: safeArea.y readonly property var layerSliderSafeYMax: safeArea.y + safeArea.height + readonly property var pathSliderSafeXMin: safeArea.x + playButton.width //todo playbutton margin or group button + slider in an item? + readonly property var pathSliderSafeXMax: safeArea.x + safeArea.width visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity @@ -26,13 +29,21 @@ Item PathSlider { id: pathSlider + + readonly property var preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider + readonly property var margin: UM.Theme.getSize("default_margin").width + readonly property var pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin + height: UM.Theme.getSize("slider_handle").width - width: UM.Theme.getSize("slider_layerview_size").height + width: preferredWidth + margin * 2 < pathSliderSafeWidth ? preferredWidth : pathSliderSafeWidth - margin * 2 + anchors.bottom: parent.bottom - anchors.bottomMargin: UM.Theme.getSize("default_margin").height + anchors.bottomMargin: margin anchors.horizontalCenter: parent.horizontalCenter + anchors.horizontalCenterOffset: -(parent.width - pathSliderSafeXMax - pathSliderSafeXMin) / 2 // center between parent top and layerSliderSafeYMax + visible: !UM.SimulationView.compatibilityMode @@ -184,16 +195,19 @@ Item { property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height property double heightMargin: UM.Theme.getSize("default_margin").height + property double layerSliderSafeHeight: layerSliderSafeYMax - layerSliderSafeYMin + //todo incorporate margins in safeHeight? + id: layerSlider width: UM.Theme.getSize("slider_handle").width - height: preferredHeight + heightMargin * 2 < layerSliderSafeYMax ? preferredHeight : layerSliderSafeYMax - heightMargin * 2 + height: preferredHeight + heightMargin * 2 < layerSliderSafeHeight ? preferredHeight : layerSliderSafeHeight - heightMargin * 2 anchors { right: parent.right verticalCenter: parent.verticalCenter - verticalCenterOffset: -(parent.height - layerSliderSafeYMax) / 2 // center between parent top and layerSliderSafeYMax + verticalCenterOffset: -(parent.height - layerSliderSafeYMax - layerSliderSafeYMin) / 2 // center between parent top and layerSliderSafeYMax rightMargin: UM.Theme.getSize("default_margin").width bottomMargin: heightMargin topMargin: heightMargin diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 828d8854dd..023072ddd3 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -301,6 +301,17 @@ UM.MainWindow } } + // A hint for the loaded content view. Overlay items / controls can safely be placed in this area + Rectangle { + id: mainSafeArea + anchors.left: viewOrientationControls.right + anchors.right: main.right + anchors.top: main.top + anchors.bottom: main.bottom + visible: true // set to true for debugging only + color:"#8000FF00" + } + Loader { // A stage can control this area. If nothing is set, it will therefore show the 3D view. @@ -316,6 +327,12 @@ UM.MainWindow } source: UM.Controller.activeStage != null ? UM.Controller.activeStage.mainComponent : "" + + onLoaded: { + if (main.item.safeArea !== undefined){ + main.item.safeArea = Qt.binding(function() { return mainSafeArea }); + } + } } Loader From f090b5898e93cd6b8204ed7ab793d0128cf59fcf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:09:31 +0200 Subject: [PATCH 777/994] Small qml speed improvements for setting item --- cura/Settings/SettingInheritanceManager.py | 2 +- resources/qml/Settings/SettingItem.qml | 32 ++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 12b541c3d8..780b2c8705 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -89,7 +89,7 @@ class SettingInheritanceManager(QObject): @pyqtSlot() def forceUpdate(self) -> None: - self._update() + self._update_timer.start() def _onActiveExtruderChanged(self) -> None: new_active_stack = ExtruderManager.getInstance().getActiveExtruderStack() diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index c851b7c042..e2e8d9fbad 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -23,17 +23,16 @@ Item property alias contents: controlContainer.children property alias hovered: mouse.containsMouse - property var showRevertButton: true - property var showInheritButton: true - property var showLinkedSettingIcon: true - property var doDepthIndentation: true - property var doQualityUserSettingEmphasis: true + property bool showRevertButton: true + property bool showInheritButton: true + property bool showLinkedSettingIcon: true + property bool doDepthIndentation: true + property bool doQualityUserSettingEmphasis: true property var settingKey: definition.key //Used to detect each individual setting more easily in Squish GUI tests. // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) property var state: propertyProvider.properties.state - // There is no resolve property if there is only one stack. - property var resolve: Cura.MachineManager.activeStackId !== Cura.MachineManager.activeMachine.id ? propertyProvider.properties.resolve : "None" + property var resolve: propertyProvider.properties.resolve property var stackLevels: propertyProvider.stackLevels property var stackLevel: stackLevels[0] // A list of stack levels that will trigger to show the revert button @@ -149,7 +148,7 @@ Item color: UM.Theme.getColor("setting_control_text") opacity: (definition.visible) ? 1 : 0.5 // emphasize the setting if it has a value in the user or quality profile - font: base.doQualityUserSettingEmphasis && base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default") + font: base.doQualityUserSettingEmphasis && base.stackLevel !== undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default") } Row @@ -170,10 +169,11 @@ Item { id: linkedSettingIcon; - visible: Cura.MachineManager.activeStack != Cura.MachineManager.activeMachine && (!definition.settable_per_extruder || String(globalPropertyProvider.properties.limit_to_extruder) != "-1") && base.showLinkedSettingIcon + visible: Cura.MachineManager.activeStack !== Cura.MachineManager.activeMachine && (!definition.settable_per_extruder || String(globalPropertyProvider.properties.limit_to_extruder) != "-1") && base.showLinkedSettingIcon - height: parent.height; - width: height; + anchors.top: parent.top + anchors.bottom: parent.bottom + width: height color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button") @@ -184,7 +184,7 @@ Item { hoverTimer.stop() var tooltipText = catalog.i18nc("@label", "This setting is always shared between all extruders. Changing it here will change the value for all extruders.") - if ((resolve != "None") && (stackLevel != 0)) + if ((resolve !== "None") && (stackLevel !== 0)) { // We come here if a setting has a resolve and the setting is not manually edited. tooltipText += " " + catalog.i18nc("@label", "The value is resolved from per-extruder values ") + "[" + Cura.ExtruderManager.getInstanceExtruderValues(definition.key) + "]." @@ -200,7 +200,8 @@ Item visible: base.resetButtonVisible - height: parent.height + anchors.top: parent.top + anchors.bottom: parent.bottom width: height color: UM.Theme.getColor("setting_control_button") @@ -278,7 +279,8 @@ Item return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, String(globalPropertyProvider.properties.limit_to_extruder)).indexOf(definition.key) >= 0 } - height: parent.height + anchors.top: parent.top + anchors.bottom: parent.bottom width: height onClicked: @@ -296,7 +298,7 @@ Item break } } - if ((last_entry == 4 || last_entry == 11) && base.stackLevel == 0 && base.stackLevels.length == 2) + if ((last_entry === 4 || last_entry === 11) && base.stackLevel === 0 && base.stackLevels.length === 2) { // Special case of the inherit reset. If only the definition (4th or 11th) container) and the first // entry (user container) are set, we can simply remove the container. From 93e97c5dcef0d48f68b7162adaa02b6d42d32b8d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:15:21 +0200 Subject: [PATCH 778/994] Add update timer to intentCategory model --- cura/Machines/Models/IntentCategoryModel.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index add70f4c1a..0ff52b325a 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -1,7 +1,7 @@ #Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import Qt +from PyQt5.QtCore import Qt, QTimer import collections from typing import TYPE_CHECKING, Optional, Dict @@ -69,6 +69,11 @@ class IntentCategoryModel(ListModel): extruder_manager = application.getExtruderManager() extruder_manager.extrudersChanged.connect(self.update) + self._update_timer = QTimer() + self._update_timer.setInterval(500) + self._update_timer.setSingleShot(True) + self._update_timer.timeout.connect(self._update) + self.update() ## Updates the list of intents if an intent profile was added or removed. @@ -76,8 +81,11 @@ class IntentCategoryModel(ListModel): if container.getMetaDataEntry("type") == "intent": self.update() + def update(self): + self._update_timer.start() + ## Updates the list of intents. - def update(self) -> None: + def _update(self) -> None: available_categories = IntentManager.getInstance().currentAvailableIntentCategories() result = [] for category in available_categories: From 27701f765310bb58dc76373abe97a02f84ae5a2d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:28:17 +0200 Subject: [PATCH 779/994] Add a few process events to setActiveMachine to make it react more smooth --- cura/Settings/MachineManager.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aa48e39410..69fa907d8b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -291,7 +291,8 @@ class MachineManager(QObject): @pyqtSlot(str) def setActiveMachine(self, stack_id: str) -> None: self.blurSettings.emit() # Ensure no-one has focus. - + self._application.processEvents() + container_registry = CuraContainerRegistry.getInstance() containers = container_registry.findContainerStacks(id = stack_id) if not containers: @@ -301,9 +302,11 @@ class MachineManager(QObject): # Make sure that the default machine actions for this machine have been added self._application.getMachineActionManager().addDefaultMachineActions(global_stack) + self._application.processEvents() extruder_manager = ExtruderManager.getInstance() extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack) + self._application.processEvents() if not global_stack.isValid(): # Mark global stack as invalid ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId()) @@ -313,8 +316,12 @@ class MachineManager(QObject): extruder_manager.addMachineExtruders(global_stack) self._application.setGlobalContainerStack(global_stack) + self._application.processEvents() + # Switch to the first enabled extruder self.updateDefaultExtruder() + + self._application.processEvents() default_extruder_position = int(self.defaultExtruderPosition) old_active_extruder_index = extruder_manager.activeExtruderIndex extruder_manager.setActiveExtruderIndex(default_extruder_position) From 7f1cc84eb4ffb88be0d1a5d4cbb43e2fde097e38 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:36:49 +0200 Subject: [PATCH 780/994] Simplify visible check for linkedSettings Icon It was checking for a statement that is never True --- resources/qml/Settings/SettingItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index e2e8d9fbad..3531b10244 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -169,7 +169,7 @@ Item { id: linkedSettingIcon; - visible: Cura.MachineManager.activeStack !== Cura.MachineManager.activeMachine && (!definition.settable_per_extruder || String(globalPropertyProvider.properties.limit_to_extruder) != "-1") && base.showLinkedSettingIcon + visible: (!definition.settable_per_extruder || String(globalPropertyProvider.properties.limit_to_extruder) != "-1") && base.showLinkedSettingIcon anchors.top: parent.top anchors.bottom: parent.bottom From 5f2984b77ea350a6d59425988dfb122647956ae2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:42:07 +0200 Subject: [PATCH 781/994] Remove unused catalog 20ms faster is 20ms faster... --- .../Recommended/RecommendedPrintSetup.qml | 6 ------ resources/qml/Settings/SettingView.qml | 2 -- 2 files changed, 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index a180ad6324..22c4039063 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -19,12 +19,6 @@ Item property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 property real padding: UM.Theme.getSize("thick_margin").width - UM.I18nCatalog - { - id: catalog - name: "cura" - } - Column { spacing: UM.Theme.getSize("wide_margin").height diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 20e9af59db..53e432ecae 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -419,8 +419,6 @@ Item } } - UM.I18nCatalog { id: catalog; name: "cura"; } - NumberAnimation { id: animateContentY target: contents From 4cc8bf594688ff81f8cce668fd702c86ca714edb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Oct 2019 15:54:45 +0200 Subject: [PATCH 782/994] Create tooltips on demand instead of on creation. This makes the loading of setting items a *lot* more faster, as each string takes about 2.5 ms to create (and we load all of them in memory!). --- resources/qml/Settings/SettingItem.qml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 3531b10244..e1b3f5a098 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -56,7 +56,8 @@ Item signal showTooltip(string text) signal hideTooltip() signal showAllHiddenInheritedSettings(string category_id) - property string tooltipText: + + function createTooltipText() { var affects = settingDefinitionsModel.getRequiredBy(definition.key, "value") var affected_by = settingDefinitionsModel.getRequires(definition.key, "value") @@ -127,7 +128,7 @@ Item onTriggered: { - base.showTooltip(base.tooltipText) + base.showTooltip(base.createTooltipText()) } } @@ -191,7 +192,7 @@ Item } base.showTooltip(tooltipText) } - onExited: base.showTooltip(base.tooltipText) + onExited: base.showTooltip(base.createTooltipText()) } UM.SimpleButton @@ -228,7 +229,7 @@ Item hoverTimer.stop() base.showTooltip(catalog.i18nc("@label", "This setting has a value that is different from the profile.\n\nClick to restore the value of the profile.")) } - onExited: base.showTooltip(base.tooltipText) + onExited: base.showTooltip(base.createTooltipText()) } UM.SimpleButton @@ -322,7 +323,7 @@ Item iconSource: UM.Theme.getIcon("formula") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } - onExited: base.showTooltip(base.tooltipText) + onExited: base.showTooltip(base.createTooltipText()) } } From 11d30dab56ce8d295b2aaa7ca4aa9585708ee69d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 Oct 2019 23:21:30 +0200 Subject: [PATCH 783/994] Improve setting descriptions for flow rate compensation settings The original setting descriptions were wholly undescriptive... Done during investigation of these settings for the Setting Guide. --- resources/definitions/fdmprinter.def.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ca0057adb4..cd847ef8b6 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6658,30 +6658,26 @@ }, "flow_rate_max_extrusion_offset": { - "label": "Flow rate compensation max extrusion offset", - "description": "The maximum distance in mm to compensate.", + "label": "Flow Rate Compensation Max Extrusion Offset", + "description": "The maximum distance in mm to move the filament to compensate for changes in flow rate.", "unit": "mm", "type": "float", "minimum_value": "0", "maximum_value_warning": "10", "default_value": 0, - "value": "0", - "enabled": true, "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false }, "flow_rate_extrusion_offset_factor": { - "label": "Flow rate compensation factor", - "description": "The multiplication factor for the flow rate -> distance translation.", + "label": "Flow Rate Compensation Factor", + "description": "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion.", "unit": "%", "type": "float", "minimum_value": "0", "maximum_value_warning": "100", "default_value": 100, - "value": "100", - "enabled": true, "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false From 7dada6539c6571dfbb8d439e1df4d13db3543f05 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sat, 26 Oct 2019 01:12:34 +0200 Subject: [PATCH 784/994] Fix minimum speeds and distances for wire printing Minimum distance is 0.001, i.e. one micrometre. Minimum speeds are set to Marlin's Minimum Planner Speed which is hardcoded. --- resources/definitions/fdmprinter.def.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index cd847ef8b6..f9c96693ea 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6700,7 +6700,7 @@ "unit": "mm", "default_value": 3, "value": "machine_nozzle_head_distance", - "minimum_value": "0.0001", + "minimum_value": "0.001", "maximum_value_warning": "20", "enabled": "wireframe_enabled", "settable_per_mesh": false, @@ -6730,7 +6730,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, - "minimum_value": "0.1", + "minimum_value": "0.05", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", @@ -6746,7 +6746,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, - "minimum_value": "0.1", + "minimum_value": "0.05", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", @@ -6762,7 +6762,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, - "minimum_value": "0.1", + "minimum_value": "0.05", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", @@ -6778,7 +6778,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, - "minimum_value": "0.1", + "minimum_value": "0.05", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", @@ -6794,7 +6794,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, - "minimum_value": "0.1", + "minimum_value": "0.05", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "100", "value": "wireframe_printspeed", @@ -7068,7 +7068,7 @@ "default_value": 0.01, "unit": "mm", "settable_per_mesh": false, - "minimum_value": "0.0001", + "minimum_value": "0.001", "settable_per_extruder": false, "settable_per_meshgroup": false }, From 0ea67d18d23109b35eeca99a598fe13b45213181 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 27 Oct 2019 01:00:17 +0200 Subject: [PATCH 785/994] Only show strategy-specific settings if their WP strategy is activated Reduces confusion, I hope, and the feeling of being overwhelmed by a load of settings, because obviously only people who make all settings visible are going to see these settings at all. --- resources/definitions/fdmprinter.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f9c96693ea..8511d9e969 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6750,7 +6750,7 @@ "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", - "value": "wireframe_printspeed", + "value": "wireframe_printspeed_flat", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -6917,7 +6917,7 @@ "default_value": 0.6, "minimum_value": "0", "maximum_value_warning": "2.0", - "enabled": "wireframe_enabled", + "enabled": "wireframe_enabled and wireframe_strategy == 'knot'", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -6931,7 +6931,7 @@ "default_value": 0.5, "minimum_value": "0", "maximum_value_warning": "wireframe_height", - "enabled": "wireframe_enabled", + "enabled": "wireframe_enabled and wireframe_strategy == 'compensate'", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -6945,7 +6945,7 @@ "default_value": 0.6, "minimum_value": "0", "maximum_value_warning": "wireframe_height", - "enabled": "wireframe_enabled", + "enabled": "wireframe_enabled and wireframe_strategy == 'compensate'", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false From 200111e2745b0b8e9a65c968aa49b6e1fba58ae4 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 10:59:23 +0800 Subject: [PATCH 786/994] Add files via upload makeblock definition file --- resources/definitions/makeblock.def.json | 68 ++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 resources/definitions/makeblock.def.json diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock.def.json new file mode 100644 index 0000000000..e3206aa178 --- /dev/null +++ b/resources/definitions/makeblock.def.json @@ -0,0 +1,68 @@ +{ + "version": 2, + "name": "Makeblock", + "inherits": "fdmprinter", + "metadata": { + "author": "Makeblock", + "manufacturer": "Makeblock", + "visible": true, + "file_formats": "application/gzip;text/x-gcode", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": { + "0": "makeblock_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "makeblock" + }, + "machine_width": { + "default_value": 225 + }, + "machine_depth": { + "default_value": 225 + }, + "machine_height": { + "default_value": 300 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ] + }, + "machine_gcode_flavor": { + "default_value": "Marlin" + }, + "gantry_height": { + "default_value": 0 + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nM43 E1\nG92 E0\nG1 F600 E20\nG92 E0\nG1 F300 E-20\nG1 F3000 X32 Y55\nG38.2 F480 Z-20\nG92 Z0\nG1 F300 Z5\nG1 F2000 X20 Y20\nG1 F300 Z0\nG1 F2000 X20 Y15\nG1 F2000 X20 Y20\nG1 F300 X20 Y15\nG1 F300 Z0\n;G29\nG1 F2000 X30 Y60\nG38.2 F200 Z-20\nG92 Z0\nG1 F300 Z0.45\nG1 F3000 X25 Y25\nG92 X0 Y0 Z0\nG1 Z20\nG1 F300 E2\nG92 E0\n;Prime the extruder" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} From eb6247620df4141695f2e13dfd59712979192df8 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 11:00:17 +0800 Subject: [PATCH 787/994] Add files via upload makeblock extruders file --- .../extruders/makeblock_extruder_0.def.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 resources/extruders/makeblock_extruder_0.def.json diff --git a/resources/extruders/makeblock_extruder_0.def.json b/resources/extruders/makeblock_extruder_0.def.json new file mode 100644 index 0000000000..138ae09a0b --- /dev/null +++ b/resources/extruders/makeblock_extruder_0.def.json @@ -0,0 +1,21 @@ +{ + "id": "makeblock_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "makeblock", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} \ No newline at end of file From 31edf4e60be62589b8dc1ecdadf7ea1090d1895c Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 11:00:55 +0800 Subject: [PATCH 788/994] Add files via upload makeblock quality file --- .../makeblock/makeblock_pla_normal.inst.cfg | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 resources/quality/makeblock/makeblock_pla_normal.inst.cfg diff --git a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_pla_normal.inst.cfg new file mode 100644 index 0000000000..5bcfc58f63 --- /dev/null +++ b/resources/quality/makeblock/makeblock_pla_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Fine +definition = makeblock + +[metadata] +setting_version = 6 +type = quality +quality_type = normal +weight = 0 +material = generic_pla + +[values] +default_material_print_temperature = 190 +material_initial_print_temperature = 190 +material_final_print_temperature = 185 +material_flow = 94 +retraction_speed = 55 +skirt_line_count = 2 +adhesion_type = skirt \ No newline at end of file From d59a343b3f4020e2ff9742376378d143b4f59ad3 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 28 Oct 2019 09:59:30 +0100 Subject: [PATCH 789/994] Update simulation slider handle position after width change CURA-6874 --- plugins/SimulationView/PathSlider.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml index c7a43c6407..facdbb6a53 100644 --- a/plugins/SimulationView/PathSlider.qml +++ b/plugins/SimulationView/PathSlider.qml @@ -56,6 +56,11 @@ Item return Math.min(Math.max(value, sliderRoot.minimumValue), sliderRoot.maximumValue) } + onWidthChanged : { + // After a width change, the pixel-position of the handle is out of sync with the property value + setHandleValue(handleValue) + } + // slider track Rectangle { From 6bef16bbecd5044b19847d6d4f4b92deba2fe60a Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 28 Oct 2019 10:28:19 +0100 Subject: [PATCH 790/994] Cleanup: make safe areas invisible CURA-6874 --- plugins/PreviewStage/PreviewMain.qml | 2 +- resources/qml/Cura.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 0b93dea0af..719b5c0c0b 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -24,7 +24,7 @@ Item y: safeArea.y - parent.y width: actionPanelWidget.x - x height: actionPanelWidget.y - y - visible: true // true for debug only + visible: false // true for debug only color:"#800000FF" Component.onCompleted: { diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 023072ddd3..1f7ccf39a5 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -308,7 +308,7 @@ UM.MainWindow anchors.right: main.right anchors.top: main.top anchors.bottom: main.bottom - visible: true // set to true for debugging only + visible: false // set to true for debugging only color:"#8000FF00" } From c5623a1364306087eb43df23cdb7e39fe6e49d94 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 28 Oct 2019 10:30:25 +0100 Subject: [PATCH 791/994] Also catch ValueError when handling modelParsing from network CURA-6855 --- plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py index f61982b9a8..6a8b9f625c 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py @@ -135,7 +135,7 @@ class ClusterApiClient: result = model_class(**response) # type: ClusterApiClientModel on_finished_item = cast(Callable[[ClusterApiClientModel], Any], on_finished) on_finished_item(result) - except (JSONDecodeError, TypeError): + except (JSONDecodeError, TypeError, ValueError): Logger.log("e", "Could not parse response from network: %s", str(response)) ## Creates a callback function so that it includes the parsing of the response into the correct model. From b360e0db3943fe1bb9d95e35c41e3630c7a06e40 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 28 Oct 2019 10:44:21 +0100 Subject: [PATCH 792/994] Fix numberExtrudersEnabled returning None CURA-6931 --- cura/Settings/MachineManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aa48e39410..d7a7586115 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -872,7 +872,10 @@ class MachineManager(QObject): def numberExtrudersEnabled(self) -> int: if self._global_container_stack is None: return 1 - return self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") + extruders_enabled_count = self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") + if extruders_enabled_count is None: + extruders_enabled_count = len(self._global_container_stack.extruderList) + return extruders_enabled_count @pyqtProperty(str, notify = extruderChanged) def defaultExtruderPosition(self) -> str: From 9e6207794b682df4e275410866971ec93734cc7d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 24 Oct 2019 13:19:06 +0200 Subject: [PATCH 793/994] Add CMake options to exclude plugins for installation CURA-6557 --- CMakeLists.txt | 6 +- cmake/CuraPluginInstall.cmake | 98 ++++++++++++++++++++++++++++++ cmake/mod_bundled_packages_json.py | 71 ++++++++++++++++++++++ 3 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 cmake/CuraPluginInstall.cmake create mode 100755 cmake/mod_bundled_packages_json.py diff --git a/CMakeLists.txt b/CMakeLists.txt index b516de6b63..4954ac46dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ endif() if(NOT ${URANIUM_DIR} STREQUAL "") - set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake") + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake") endif() if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "") list(APPEND CMAKE_MODULE_PATH ${URANIUM_DIR}/cmake) @@ -63,8 +63,8 @@ endif() install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) -install(DIRECTORY plugins - DESTINATION lib${LIB_SUFFIX}/cura) + +include(CuraPluginInstall) if(NOT APPLE AND NOT WIN32) install(FILES cura_app.py diff --git a/cmake/CuraPluginInstall.cmake b/cmake/CuraPluginInstall.cmake new file mode 100644 index 0000000000..2eadb6c18f --- /dev/null +++ b/cmake/CuraPluginInstall.cmake @@ -0,0 +1,98 @@ +# Copyright (c) 2019 Ultimaker B.V. +# CuraPluginInstall.cmake is released under the terms of the LGPLv3 or higher. + +# +# This module detects all plugins that need to be installed and adds them using the CMake install() command. +# It detects all plugin folder in the path "plugins/*" where there's a "plugin.json" in it. +# +# Plugins can be configured to NOT BE INSTALLED via the variable "CURA_NO_INSTALL_PLUGINS" as a list of string in the +# form of "a;b;c" or "a,b,c". By default all plugins will be installed. +# + +# FIXME: Remove the code for CMake <3.12 once we have switched over completely. +# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 +# module is copied from the CMake repository here so in CMake <3.12 we can still use it. +if(${CMAKE_VERSION} VERSION_LESS 3.12) + # Use FindPythonInterp and FindPythonLibs for CMake <3.12 + find_package(PythonInterp 3 REQUIRED) + + set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) +else() + # Use FindPython3 for CMake >=3.12 + find_package(Python3 REQUIRED COMPONENTS Interpreter) +endif() + +# Options or configuration variables +set(CURA_NO_INSTALL_PLUGINS "" CACHE STRING "A list of plugins that should not be installed, separated with ';' or ','.") + +file(GLOB_RECURSE _plugin_json_list ${CMAKE_SOURCE_DIR}/plugins/*/plugin.json) +list(LENGTH _plugin_json_list _plugin_json_list_len) + +# Sort the lists alphabetically so we can handle cases like this: +# - plugins/my_plugin/plugin.json +# - plugins/my_plugin/my_module/plugin.json +# In this case, only "plugins/my_plugin" should be added via install(). +set(_no_install_plugin_list ${CURA_NO_INSTALL_PLUGINS}) +# Sanitize the string so the comparison will be case-insensitive. +string(STRIP "${_no_install_plugin_list}" _no_install_plugin_list) +string(TOLOWER "${_no_install_plugin_list}" _no_install_plugin_list) + +# WORKAROUND counterpart of what's in cura-build. +string(REPLACE "," ";" _no_install_plugin_list "${_no_install_plugin_list}") + +list(LENGTH _no_install_plugin_list _no_install_plugin_list_len) + +if(_no_install_plugin_list_len GREATER 0) + list(SORT _no_install_plugin_list) +endif() +if(_plugin_json_list_len GREATER 0) + list(SORT _plugin_json_list) +endif() + +# Check all plugin directories and add them via install() if needed. +set(_install_plugin_list "") +foreach(_plugin_json_path ${_plugin_json_list}) + get_filename_component(_plugin_dir ${_plugin_json_path} DIRECTORY) + file(RELATIVE_PATH _rel_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_plugin_dir}) + get_filename_component(_plugin_dir_name ${_plugin_dir} NAME) + + # Make plugin name comparison case-insensitive + string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase) + + # Check if this plugin needs to be skipped for installation + set(_add_plugin ON) + set(_is_no_install_plugin OFF) + if(_no_install_plugin_list) + if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list) + set(_add_plugin OFF) + set(_is_no_install_plugin ON) + endif() + endif() + + # Make sure this is not a subdirectory in a plugin that's already in the install list + if(_add_plugin) + foreach(_known_install_plugin_dir ${_install_plugin_list}) + if(_plugin_dir MATCHES "${_known_install_plugin_dir}.+") + set(_add_plugin OFF) + break() + endif() + endforeach() + endif() + + if(_add_plugin) + message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}") + get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY) + install(DIRECTORY ${_rel_plugin_dir} + DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir} + PATTERN "__pycache__" EXCLUDE + PATTERN "*.qmlc" EXCLUDE + ) + list(APPEND _install_plugin_list ${_plugin_dir}) + elseif(_is_no_install_plugin) + message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}") + execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py + -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages + ${_plugin_dir_name} + RESULT_VARIABLE _mod_json_result) + endif() +endforeach() diff --git a/cmake/mod_bundled_packages_json.py b/cmake/mod_bundled_packages_json.py new file mode 100755 index 0000000000..8a33f88a5a --- /dev/null +++ b/cmake/mod_bundled_packages_json.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python3 +# +# This script removes the given package entries in the bundled_packages JSON files. This is used by the PluginInstall +# CMake module. +# + +import argparse +import collections +import json +import os +import sys + + +def find_json_files(work_dir: str) -> list: + """ + Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths. + :param work_dir: The directory to look for JSON files recursively. + :return: A list of JSON files in absolute paths that are found in the given directory. + """ + json_file_list = [] + for root, dir_names, file_names in os.walk(work_dir): + for file_name in file_names: + abs_path = os.path.abspath(os.path.join(root, file_name)) + json_file_list.append(abs_path) + return json_file_list + + +def remove_entries_from_json_file(file_path: str, entries: list) -> None: + """ + Removes the given entries from the given JSON file. The file will modified in-place. + :param file_path: The JSON file to modify. + :param entries: A list of strings as entries to remove. + :return: None + """ + try: + with open(file_path, "r", encoding = "utf-8") as f: + package_dict = json.load(f, object_hook = collections.OrderedDict) + except Exception as e: + msg = "Failed to load '{file_path}' as a JSON file. This file will be ignored Exception: {e}"\ + .format(file_path = file_path, e = e) + sys.stderr.write(msg + os.linesep) + return + + for entry in entries: + if entry in package_dict: + del package_dict[entry] + print("[INFO] Remove entry [{entry}] from [{file_path}]".format(file_path = file_path, entry = entry)) + + try: + with open(file_path, "w", encoding = "utf-8", newline = "\n") as f: + json.dump(package_dict, f, indent = 4) + except Exception as e: + msg = "Failed to write '{file_path}' as a JSON file. Exception: {e}".format(file_path = file_path, e = e) + raise IOError(msg) + + +def main() -> None: + parser = argparse.ArgumentParser("mod_bundled_packages_json") + parser.add_argument("-d", "--dir", dest = "work_dir", + help = "The directory to look for bundled packages JSON files, recursively.") + parser.add_argument("entries", metavar = "ENTRIES", type = str, nargs = "+") + + args = parser.parse_args() + + json_file_list = find_json_files(args.work_dir) + for json_file_path in json_file_list: + remove_entries_from_json_file(json_file_path, args.entries) + + +if __name__ == "__main__": + main() From 3f1a3d76eab136f818bfef8513cd42ad8f477265 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 28 Oct 2019 14:37:07 +0100 Subject: [PATCH 794/994] Add more docs CURA-6557 --- cmake/CuraPluginInstall.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/CuraPluginInstall.cmake b/cmake/CuraPluginInstall.cmake index 2eadb6c18f..d35e74acb8 100644 --- a/cmake/CuraPluginInstall.cmake +++ b/cmake/CuraPluginInstall.cmake @@ -60,8 +60,9 @@ foreach(_plugin_json_path ${_plugin_json_list}) string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase) # Check if this plugin needs to be skipped for installation - set(_add_plugin ON) - set(_is_no_install_plugin OFF) + set(_add_plugin ON) # Indicates if this plugin should be added to the build or not. + set(_is_no_install_plugin OFF) # If this plugin will not be added, this indicates if it's because the plugin is + # specified in the NO_INSTALL_PLUGINS list. if(_no_install_plugin_list) if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list) set(_add_plugin OFF) From 95350cda51f35a1b4552846dafb4ceef77edc6bd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 28 Oct 2019 16:04:43 +0100 Subject: [PATCH 795/994] Revert "Add a few process events to setActiveMachine to make it react more smooth" This reverts commit 27701f765310bb58dc76373abe97a02f84ae5a2d. After discussion with Nallath we've decided that it wasn't that noticeable and could temporarily display wrong names in the interface. We've decided to undo it for now. Contributes to issue CURA-6932. --- cura/Settings/MachineManager.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 69fa907d8b..aa48e39410 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -291,8 +291,7 @@ class MachineManager(QObject): @pyqtSlot(str) def setActiveMachine(self, stack_id: str) -> None: self.blurSettings.emit() # Ensure no-one has focus. - self._application.processEvents() - + container_registry = CuraContainerRegistry.getInstance() containers = container_registry.findContainerStacks(id = stack_id) if not containers: @@ -302,11 +301,9 @@ class MachineManager(QObject): # Make sure that the default machine actions for this machine have been added self._application.getMachineActionManager().addDefaultMachineActions(global_stack) - self._application.processEvents() extruder_manager = ExtruderManager.getInstance() extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack) - self._application.processEvents() if not global_stack.isValid(): # Mark global stack as invalid ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId()) @@ -316,12 +313,8 @@ class MachineManager(QObject): extruder_manager.addMachineExtruders(global_stack) self._application.setGlobalContainerStack(global_stack) - self._application.processEvents() - # Switch to the first enabled extruder self.updateDefaultExtruder() - - self._application.processEvents() default_extruder_position = int(self.defaultExtruderPosition) old_active_extruder_index = extruder_manager.activeExtruderIndex extruder_manager.setActiveExtruderIndex(default_extruder_position) From 7204deac0ccc3b5f7bcd7dbe84f07d835225a4ff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 28 Oct 2019 16:07:35 +0100 Subject: [PATCH 796/994] Rename function to beter reflect what it does CURA-6932 --- cura/Settings/SettingInheritanceManager.py | 2 +- resources/qml/Settings/SettingView.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 780b2c8705..8be0813d0a 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -88,7 +88,7 @@ class SettingInheritanceManager(QObject): self.settingsWithIntheritanceChanged.emit() @pyqtSlot() - def forceUpdate(self) -> None: + def scheduleUpdate(self) -> None: self._update_timer.start() def _onActiveExtruderChanged(self) -> None: diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 53e432ecae..5aea939728 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -241,7 +241,7 @@ Item CuraApplication.setExpandedCategories(expanded) } } - onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate() + onVisibilityChanged: Cura.SettingInheritanceManager.scheduleUpdate() } property int indexWithFocus: -1 From 26ba0e645a973d051347902affc1baf3d43fe837 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 28 Oct 2019 16:33:08 +0100 Subject: [PATCH 797/994] Ensure that first start machine actions model gets initialized CURA-6932 --- cura/CuraApplication.py | 2 ++ cura/Machines/Models/FirstStartMachineActionsModel.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 4ce8eadaf8..f88467d651 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -880,6 +880,8 @@ class CuraApplication(QtApplication): def getFirstStartMachineActionsModel(self, *args) -> "FirstStartMachineActionsModel": if self._first_start_machine_actions_model is None: self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self) + if self.started: + self._first_start_machine_actions_model.initialize() return self._first_start_machine_actions_model @pyqtSlot(result = QObject) diff --git a/cura/Machines/Models/FirstStartMachineActionsModel.py b/cura/Machines/Models/FirstStartMachineActionsModel.py index ce0e9bf856..92caed7b12 100644 --- a/cura/Machines/Models/FirstStartMachineActionsModel.py +++ b/cura/Machines/Models/FirstStartMachineActionsModel.py @@ -33,11 +33,11 @@ class FirstStartMachineActionsModel(ListModel): self._current_action_index = 0 self._application = application - self._application.initializationFinished.connect(self._initialize) + self._application.initializationFinished.connect(self.initialize) self._previous_global_stack = None - def _initialize(self) -> None: + def initialize(self) -> None: self._application.getMachineManager().globalContainerChanged.connect(self._update) self._update() From 8154ca5f7ced9a2a1ba96af2d627f3faef9f1f60 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 28 Oct 2019 16:42:24 +0100 Subject: [PATCH 798/994] Improve translations for option for heated build plate Eigenbouw is typisch zo'n woord bedacht door iemand die helemaal verzadigd is na een lange dag vertalen... Discovered while working on issue CURA-6932. --- resources/i18n/nl_NL/cura.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index d15742a101..3059e4aa1d 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -2795,7 +2795,7 @@ msgstr "Selecteer eventuele upgrades die op deze Ultimaker Original zijn uitgevo #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:41 msgctxt "@label" msgid "Heated Build Plate (official kit or self-built)" -msgstr "Verwarmd Platform (officiële kit of eigenbouw)" +msgstr "Verwarmd Platform (officiële kit of zelf gebouwd)" #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:119 msgctxt "@label:MonitorStatus" From 007add7fc2dbf70e7a0070d731bbe43a481f52a3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 29 Oct 2019 10:55:47 +0100 Subject: [PATCH 799/994] Prevent undefined qml warnings CURA-6935 --- resources/qml/Settings/SettingExtruder.qml | 2 +- resources/qml/Settings/SettingItem.qml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 7162744ae5..ff57381ddf 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -75,7 +75,7 @@ SettingItem base.setActiveFocusToNextSetting(false) } - currentIndex: propertyProvider.properties.value + currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0 property string color: "#fff" diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index e1b3f5a098..9986c7eaf8 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -277,6 +277,10 @@ Item // Observed when loading workspace, probably when SettingItems are removed. return false } + if(globalPropertyProvider.properties.limit_to_extruder === undefined) + { + return false + } return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, String(globalPropertyProvider.properties.limit_to_extruder)).indexOf(definition.key) >= 0 } From 18167c7a7129b0b32be00c828882d700e4e2d320 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 29 Oct 2019 11:02:54 +0100 Subject: [PATCH 800/994] Fix prime position of right extruder --- resources/extruders/ultimaker_s3_extruder_right.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/ultimaker_s3_extruder_right.def.json b/resources/extruders/ultimaker_s3_extruder_right.def.json index 6771e1c0a8..7199710327 100644 --- a/resources/extruders/ultimaker_s3_extruder_right.def.json +++ b/resources/extruders/ultimaker_s3_extruder_right.def.json @@ -22,7 +22,7 @@ "machine_extruder_end_pos_x": { "default_value": 180 }, "machine_extruder_end_pos_y": { "default_value": 180 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 180 }, + "extruder_prime_pos_x": { "value": "machine_width + 3" }, "extruder_prime_pos_y": { "default_value": 6 }, "extruder_prime_pos_z": { "default_value": 2 } } From 7b9ababc11394091f727656725fae3de75a9978d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 29 Oct 2019 11:14:49 +0100 Subject: [PATCH 801/994] Use Doxygen-style docs CURA-6557 --- cmake/mod_bundled_packages_json.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cmake/mod_bundled_packages_json.py b/cmake/mod_bundled_packages_json.py index 8a33f88a5a..6423591f57 100755 --- a/cmake/mod_bundled_packages_json.py +++ b/cmake/mod_bundled_packages_json.py @@ -11,12 +11,11 @@ import os import sys +## Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths. +# +# \param work_dir The directory to look for JSON files recursively. +# \return A list of JSON files in absolute paths that are found in the given directory. def find_json_files(work_dir: str) -> list: - """ - Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths. - :param work_dir: The directory to look for JSON files recursively. - :return: A list of JSON files in absolute paths that are found in the given directory. - """ json_file_list = [] for root, dir_names, file_names in os.walk(work_dir): for file_name in file_names: @@ -25,13 +24,12 @@ def find_json_files(work_dir: str) -> list: return json_file_list +## Removes the given entries from the given JSON file. The file will modified in-place. +# +# \param file_path The JSON file to modify. +# \param entries A list of strings as entries to remove. +# \return None def remove_entries_from_json_file(file_path: str, entries: list) -> None: - """ - Removes the given entries from the given JSON file. The file will modified in-place. - :param file_path: The JSON file to modify. - :param entries: A list of strings as entries to remove. - :return: None - """ try: with open(file_path, "r", encoding = "utf-8") as f: package_dict = json.load(f, object_hook = collections.OrderedDict) From 5ebdae9f1a7bd5b2dd7b963f091ee5ba3dba603e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 11:47:39 +0100 Subject: [PATCH 802/994] Move upper layer slider handle label to the top CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 12 +++++++----- plugins/SimulationView/SimulationSliderLabel.qml | 10 +++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 15b0fdbe12..6622272a38 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -275,10 +275,12 @@ Item { id: upperHandleLabel - height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height - x: parent.x - parent.width - width - anchors.verticalCenter: parent.verticalCenter - target: Qt.point(sliderRoot.width, y + height / 2) + height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height + //x: parent.x + anchors.bottom: parent.top + anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height + anchors.horizontalCenter: parent.horizontalCenter + target: Qt.point(parent.width / 2, parent.top) visible: sliderRoot.activeHandle == parent // custom properties @@ -397,4 +399,4 @@ Item setValue: lowerHandle.setValueManually // connect callback functions } } -} \ No newline at end of file +} diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index 06c6a51b44..a241a50145 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -20,9 +20,9 @@ UM.PointingRectangle { property int startFrom: 1 target: Qt.point(parent.width, y + height / 2) - arrowSize: UM.Theme.getSize("default_arrow").width + arrowSize: UM.Theme.getSize("button_tooltip_arrow").height height: parent.height - width: valueLabel.width + UM.Theme.getSize("default_margin").width + width: valueLabel.width visible: false color: UM.Theme.getColor("tool_panel_background") @@ -48,9 +48,9 @@ UM.PointingRectangle { horizontalCenter: parent.horizontalCenter } - width: ((maximumValue + 1).toString().length + 1) * 10 * screenScaleFactor + width: ((maximumValue + 1).toString().length + 1) * 8 * screenScaleFactor text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array - horizontalAlignment: TextInput.AlignRight + horizontalAlignment: TextInput.AlignHCenter // key bindings, work when label is currenctly focused (active handle in LayerSlider) Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) @@ -58,7 +58,7 @@ UM.PointingRectangle { style: TextFieldStyle { textColor: UM.Theme.getColor("setting_control_text") - font: UM.Theme.getFont("default") + font: UM.Theme.getFont("small") background: Item { } } From e152529b5e097aacd4c7fffb7009b103e8fc1df1 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 13:03:53 +0100 Subject: [PATCH 803/994] Increase layer slider margins to accomodate labels CURA-6854 --- plugins/SimulationView/SimulationViewMainComponent.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index cd7d108370..8d32e50654 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -183,7 +183,7 @@ Item LayerSlider { property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height - property double heightMargin: UM.Theme.getSize("default_margin").height + property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accomodate layer number tooltips id: layerSlider width: UM.Theme.getSize("slider_handle").width From ba766c3a1935accef170e2174e2745bf905842a0 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 13:23:43 +0100 Subject: [PATCH 804/994] Move lower layer slider handle label to the bottom CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 6622272a38..c1be13c628 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -276,7 +276,6 @@ Item id: upperHandleLabel height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height - //x: parent.x anchors.bottom: parent.top anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter @@ -386,10 +385,11 @@ Item { id: lowerHandleLabel - height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height - x: parent.x - parent.width - width - anchors.verticalCenter: parent.verticalCenter - target: Qt.point(sliderRoot.width + width, y + height / 2) + height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height + anchors.top: parent.bottom + anchors.topMargin: UM.Theme.getSize("narrow_margin").height + anchors.horizontalCenter: parent.horizontalCenter + target: Qt.point(parent.width / 2, parent.bottom) visible: sliderRoot.activeHandle == parent // custom properties From 3db5abbd3ac0d1561b03d9081ebda22c2d0d3518 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 13:39:52 +0100 Subject: [PATCH 805/994] Move layer slider range handle label to below the vertical center CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index c1be13c628..4ff959370c 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -161,11 +161,10 @@ Item SimulationSliderLabel { id: rangleHandleLabel - - height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height - x: parent.x - width - UM.Theme.getSize("default_margin").width - anchors.verticalCenter: parent.verticalCenter - target: Qt.point(sliderRoot.width, y + height / 2) + y: parent.height / 2 + height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height + anchors.horizontalCenter: parent.horizontalCenter + target: Qt.point(parent.width / 2, y -100) visible: sliderRoot.activeHandle == parent // custom properties From 888c3f51a5718c80f9b3736aa86e5953e1c4ed8d Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 14:11:09 +0100 Subject: [PATCH 806/994] Show both handle labels instead of the range label Now that the labels are horizontally centered with the handles, the range label would overlap the bottom handle. So instead, delete the range handle and show both other handles instead. CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 4ff959370c..eff27c43a7 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -158,21 +158,6 @@ Item onPressed: sliderRoot.setActiveHandle(rangeHandle) } - SimulationSliderLabel - { - id: rangleHandleLabel - y: parent.height / 2 - height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height - anchors.horizontalCenter: parent.horizontalCenter - target: Qt.point(parent.width / 2, y -100) - visible: sliderRoot.activeHandle == parent - - // custom properties - maximumValue: sliderRoot.maximumValue - value: sliderRoot.upperValue - busy: UM.SimulationView.busy - setValue: rangeHandle.setValueManually // connect callback functions - } } onHeightChanged : { @@ -279,7 +264,7 @@ Item anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter target: Qt.point(parent.width / 2, parent.top) - visible: sliderRoot.activeHandle == parent + visible: sliderRoot.activeHandle == parent || sliderRoot.activeHandle == rangeHandle // custom properties maximumValue: sliderRoot.maximumValue @@ -389,7 +374,7 @@ Item anchors.topMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter target: Qt.point(parent.width / 2, parent.bottom) - visible: sliderRoot.activeHandle == parent + visible: sliderRoot.activeHandle == parent || sliderRoot.activeHandle == rangeHandle // custom properties maximumValue: sliderRoot.maximumValue From 298eb27c7f4a2440c4b5f811f44a6ea3a4e26800 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 29 Oct 2019 17:45:19 +0100 Subject: [PATCH 807/994] Add possibility to check material-profiles. Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow. part of CURA-6856 --- cura/Settings/ContainerManager.py | 2 +- plugins/LegacyProfileReader/LegacyProfileReader.py | 2 +- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 4a4a7b64dd..0daf5305c4 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -247,7 +247,7 @@ class ContainerManager(QObject): try: with open(file_url, "rt", encoding = "utf-8") as f: - container.deserialize(f.read()) + container.deserialize(f.read(), file_url) except PermissionError: return {"status": "error", "message": "Permission denied when trying to read the file."} except ContainerFormatError: diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index 013bab6f11..87b26eb4ec 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -157,7 +157,7 @@ class LegacyProfileReader(ProfileReader): data = stream.getvalue() profile = InstanceContainer(profile_id) - profile.deserialize(data) # Also performs the version upgrade. + profile.deserialize(data, file_name) # Also performs the version upgrade. profile.setDirty(True) #We need to return one extruder stack and one global stack. diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 093638d594..752f17feb4 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -15,8 +15,9 @@ import UM.Dictionary from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry from UM.ConfigurationErrorMessage import ConfigurationErrorMessage +from UM.Trust import Trust -from cura.CuraApplication import CuraApplication +from cura.CuraApplication import ApplicationMetadata, CuraApplication from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType @@ -470,6 +471,17 @@ class XmlMaterialProfile(InstanceContainer): ## Overridden from InstanceContainer def deserialize(self, serialized, file_name = None): + + # NOTE: In an enterprise environment, IT might not trust every material package the user installs. + # In that case, check if this package is trusted first, and return prematurely if not. + if file_name is not None and ApplicationMetadata.CuraIsEnterpriseVersion: + from UM.Application import Application + install_prefix = os.path.abspath(Application.getInstallPrefix()) + common_path = os.path.commonpath([install_prefix, file_name]) + if common_path is None or not common_path.startswith(install_prefix): + if not Trust.getInstance().signedFileCheck(file_name): + raise Exception("Trust-check failed for material file {0}.".format(file_name)) + containers_to_add = [] # update the serialized data first from UM.Settings.Interfaces import ContainerInterface From 7cd4158ac197dff4b259e6528fc1c9e7b87b873d Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 30 Oct 2019 09:09:17 +0100 Subject: [PATCH 808/994] Adds Ultimaker S3 intent profiles As discussed 29-10-2019. --- ...um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ..._s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ ...um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ..._s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ ...m_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 34 +++++++++++++++++++ ...s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 34 +++++++++++++++++++ ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 34 +++++++++++++++++++ 9 files changed, 306 insertions(+) create mode 100644 resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg create mode 100644 resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..b41f636e63 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..b3d58c0df9 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..c85b3fce0e --- /dev/null +++ b/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_abs +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..8095a53141 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..1f38e12c42 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..e529ff7656 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg new file mode 100644 index 0000000000..edae808491 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Quick +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = smooth +quality_type = draft +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +speed_layer_0 = 20 +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +wall_line_width_x = =line_width diff --git a/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..8c6727bdb0 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = fast +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 diff --git a/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..dd64f3f185 --- /dev/null +++ b/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = engineering +quality_type = normal +material = generic_tough_pla +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =- layer_height * 0.2 From 958a92280845ba9833ca3dae5b86cecd8b0aaf24 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 30 Oct 2019 10:54:22 +0100 Subject: [PATCH 809/994] Cleanup debugging things for cura-6874 CURA-6874 --- plugins/PreviewStage/PreviewMain.qml | 11 ++--------- .../SimulationView/SimulationViewMainComponent.qml | 14 +++++++------- resources/qml/Cura.qml | 5 ++--- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 719b5c0c0b..9eac1b9d40 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -17,21 +17,14 @@ Item property var safeArea: parent // Subtract the actionPanel from the safe area. This way the view won't draw interface elements under/over it - Rectangle + Item { id: childSafeArea x: safeArea.x - parent.x y: safeArea.y - parent.y width: actionPanelWidget.x - x height: actionPanelWidget.y - y - visible: false // true for debug only - color:"#800000FF" - - Component.onCompleted: { - print("parent", parent.x, parent.y) - print("parent safe", safeArea.x, safeArea.y) - print("previewmain safe", childSafeArea.x, childSafeArea.y, childSafeArea.width, childSafeArea.height) - } + visible: false } Loader diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 0cd2027dfa..3b70c69e82 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -18,10 +18,10 @@ Item property bool isSimulationPlaying: false - readonly property var layerSliderSafeYMin: safeArea.y - readonly property var layerSliderSafeYMax: safeArea.y + safeArea.height - readonly property var pathSliderSafeXMin: safeArea.x + playButton.width //todo playbutton margin or group button + slider in an item? - readonly property var pathSliderSafeXMax: safeArea.x + safeArea.width + readonly property real layerSliderSafeYMin: safeArea.y + readonly property real layerSliderSafeYMax: safeArea.y + safeArea.height + readonly property real pathSliderSafeXMin: safeArea.x + playButton.width + readonly property real pathSliderSafeXMax: safeArea.x + safeArea.width visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity @@ -30,9 +30,9 @@ Item { id: pathSlider - readonly property var preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider - readonly property var margin: UM.Theme.getSize("default_margin").width - readonly property var pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin + readonly property real preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider + readonly property real margin: UM.Theme.getSize("default_margin").width + readonly property real pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin height: UM.Theme.getSize("slider_handle").width width: preferredWidth + margin * 2 < pathSliderSafeWidth ? preferredWidth : pathSliderSafeWidth - margin * 2 diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 1f7ccf39a5..abae84e7f0 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -302,14 +302,13 @@ UM.MainWindow } // A hint for the loaded content view. Overlay items / controls can safely be placed in this area - Rectangle { + Item { id: mainSafeArea anchors.left: viewOrientationControls.right anchors.right: main.right anchors.top: main.top anchors.bottom: main.bottom - visible: false // set to true for debugging only - color:"#8000FF00" + visible: false } Loader From d63499fb245b62385de54532f90545791eeb7f46 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 30 Oct 2019 10:57:03 +0100 Subject: [PATCH 810/994] Remove redundant visibility properties from Items CURA-6874 --- plugins/PreviewStage/PreviewMain.qml | 1 - resources/qml/Cura.qml | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 9eac1b9d40..2926f0d012 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -24,7 +24,6 @@ Item y: safeArea.y - parent.y width: actionPanelWidget.x - x height: actionPanelWidget.y - y - visible: false } Loader diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index abae84e7f0..f13f9e0ce9 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -308,7 +308,6 @@ UM.MainWindow anchors.right: main.right anchors.top: main.top anchors.bottom: main.bottom - visible: false } Loader From fe86bc1bc2567f530b90d573479e754637af33f6 Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:18:22 +0100 Subject: [PATCH 811/994] updated machine_start_gcode --- resources/definitions/skriware_2.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 2149a8e429..8873b8a5ef 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -162,7 +162,7 @@ "default_value": 1.2000000000000002 }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" }, "travel_retract_before_outer_wall": { "default_value": true @@ -630,4 +630,4 @@ "default_value": false } } -} \ No newline at end of file +} From 1284d9fe8d726e46b556caa8f2f390dc7d65220c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 30 Oct 2019 11:27:46 +0100 Subject: [PATCH 812/994] Fix setting prefered material on machine creation The previous check would occasionaly set duplicated materials --- cura/Machines/VariantNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 334a01158b..b93be9773e 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -83,7 +83,7 @@ class VariantNode(ContainerNode): # if there is no match. def preferredMaterial(self, approximate_diameter: int) -> MaterialNode: for base_material, material_node in self.materials.items(): - if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + if self.machine.preferred_material == base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node # First fallback: Choose any material with matching diameter. for material_node in self.materials.values(): From d3809f883016c1e1023c6ce8899d47ed2b842748 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 13:40:13 +0100 Subject: [PATCH 813/994] Replace logo in the top left corner This aligns it with the other Ultimaker products. Sorry, overruled by higher up. Corporate things. Contributes to issue CURA-6934. --- resources/themes/cura-light/images/logo.svg | 53 +++++++-------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index 814b157e2a..24d8da8c46 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -1,37 +1,18 @@ - - - - - - - + + + + + + + + + + + + + + + + + From d8e1402b68c64698b4a1328cebf13dda9f760df7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 13:50:42 +0100 Subject: [PATCH 814/994] Make logo larger Seems to be more towards what the rest of the products show. Contributes to issue CURA-6934. --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 0d9f624805..055f176b33 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -483,7 +483,7 @@ "default_lining": [0.08, 0.08], "default_arrow": [0.8, 0.8], - "logo": [8, 1.75], + "logo": [16, 3.5], "wide_margin": [2.0, 2.0], "thick_margin": [1.71, 1.43], From 60d59148e802316b1730906e78444a45762495cc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 14:05:35 +0100 Subject: [PATCH 815/994] Fix typo in the R Contributes to issue CURA-6934. --- resources/themes/cura-light/images/logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index 24d8da8c46..611840e248 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -12,7 +12,7 @@ - + From 6a028ac6ecf78cc3fd65806fc0f8dcad3380a10c Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Thu, 31 Oct 2019 17:32:32 +0800 Subject: [PATCH 816/994] Update makeblock.def.json update start gcode and end gcode --- resources/definitions/makeblock.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock.def.json index e3206aa178..5697a42a73 100644 --- a/resources/definitions/makeblock.def.json +++ b/resources/definitions/makeblock.def.json @@ -59,10 +59,10 @@ "default_value": 1 }, "machine_start_gcode": { - "default_value": "G28 ;Home\nM43 E1\nG92 E0\nG1 F600 E20\nG92 E0\nG1 F300 E-20\nG1 F3000 X32 Y55\nG38.2 F480 Z-20\nG92 Z0\nG1 F300 Z5\nG1 F2000 X20 Y20\nG1 F300 Z0\nG1 F2000 X20 Y15\nG1 F2000 X20 Y20\nG1 F300 X20 Y15\nG1 F300 Z0\n;G29\nG1 F2000 X30 Y60\nG38.2 F200 Z-20\nG92 Z0\nG1 F300 Z0.45\nG1 F3000 X25 Y25\nG92 X0 Y0 Z0\nG1 Z20\nG1 F300 E2\nG92 E0\n;Prime the extruder" + "default_value": "; Mcreate Start Gcode \nG28 ; Home all axes \nG92 E0 ; Reset Extruder\nG1 X0 Y0 Z15 F3000.0 ; Move to start position \nG1 E10 F400 ;load filament \nG1 E2 F400 ;retarct filament \nG92 E0 ; Reset Extruder \nG1 X0 Y130 Z15 F3000.0 \nG12 ; clean nozzle \nG1 X0 Y0 Z0.3 F3000.0 ; Move to start position \nG1 E9.0 F400 ;loadsome filament \nG92 E0 ; Reset Extruder \n; End of start GCode" }, "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" } } } From ce31e9cffeb4ab442ac51104fa3a6e6969d0f8d4 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Thu, 31 Oct 2019 11:15:10 +0100 Subject: [PATCH 817/994] Adds visual intents and create subdirectories per printer. As discussed 31-10-2019. --- .../um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 0 .../um_s3_aa0.4_ABS_Draft_Visual.inst.cfg | 17 +++++++++++++++++ ...um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 0 .../um_s3_aa0.4_ABS_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s3_aa0.4_ABS_High_Visual.inst.cfg | 17 +++++++++++++++++ ...3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 0 .../um_s3_aa0.4_ABS_Normal_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 0 .../um_s3_aa0.4_PLA_Draft_Visual.inst.cfg | 17 +++++++++++++++++ ...um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 0 .../um_s3_aa0.4_PLA_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s3_aa0.4_PLA_High_Visual.inst.cfg | 17 +++++++++++++++++ ...3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 0 .../um_s3_aa0.4_PLA_Normal_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 0 .../um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg | 17 +++++++++++++++++ ...m_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 0 .../um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s3_aa0.4_TPLA_High_Visual.inst.cfg | 17 +++++++++++++++++ ..._aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 0 .../um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 0 .../um_s5_aa0.4_ABS_Draft_Visual.inst.cfg | 16 ++++++++++++++++ ...um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 0 .../um_s5_aa0.4_ABS_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_ABS_High_Visual.inst.cfg | 17 +++++++++++++++++ ...5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 0 .../um_s5_aa0.4_ABS_Normal_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 0 .../um_s5_aa0.4_PLA_Draft_Visual.inst.cfg | 17 +++++++++++++++++ ...um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 0 .../um_s5_aa0.4_PLA_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_PLA_High_Visual.inst.cfg | 17 +++++++++++++++++ ...5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 0 .../um_s5_aa0.4_PLA_Normal_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 0 .../um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg | 16 ++++++++++++++++ ...m_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 0 .../um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg | 17 +++++++++++++++++ .../um_s5_aa0.4_TPLA_High_Visual.inst.cfg | 17 +++++++++++++++++ ..._aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 0 .../um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg | 17 +++++++++++++++++ 42 files changed, 406 insertions(+) rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s3}/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg rename resources/intent/{ => ultimaker_s5}/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg (100%) create mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg diff --git a/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..49672fcb72 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +intent_category = visual +quality_type = draft +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..35d0d86ab3 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg new file mode 100644 index 0000000000..2b656dbc35 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..aff1d9d9f0 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..0c39d43c6a --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = draft +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..92ea0837fe --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg new file mode 100644 index 0000000000..97c7ab325c --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..e012264294 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..f52eb22ec2 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = draft +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..9debbb6d43 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg new file mode 100644 index 0000000000..a57b040660 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..0f31bcce25 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s3 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..4f7ee148f9 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = visualquality_type = draft +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..0f10b8416b --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg new file mode 100644 index 0000000000..b6ea956563 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..f26003ca30 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_abs +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..a71bb898d3 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = draft +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..b20fdcb791 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg new file mode 100644 index 0000000000..3fc0006b3f --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..4138f62694 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg new file mode 100644 index 0000000000..b522d262af --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg new file mode 100644 index 0000000000..3f5d3c566e --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = fast +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg new file mode 100644 index 0000000000..3b5d9fb3db --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = high +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg similarity index 100% rename from resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg rename to resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg new file mode 100644 index 0000000000..d71bb76b35 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Visual +definition = ultimaker_s5 + +[metadata] +setting_version = 10 +type = intent +quality_type = normal +intent_category = visual +material = generic_tough_pla +variant = AA 0.4 + +[values] +speed_infill = 50 +wall_thickness = =wall_line_width * 3 +top_bottom_thickness = =wall_thickness From f679b557dc391cc362a123c4ddfae69c492c4be9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Oct 2019 11:51:40 +0100 Subject: [PATCH 818/994] Add visual quality to model to be translatable CURA-6942 --- cura/Machines/Models/IntentCategoryModel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 0ff52b325a..20d07864bf 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -35,16 +35,20 @@ class IntentCategoryModel(ListModel): _translations["default"] = { "name": catalog.i18nc("@label", "Default") } + _translations["visual"] = { + "name": catalog.i18nc("@label", "Visual"), + "description": catalog.i18nc("@text", "Optimized for appearance") + } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), "description": catalog.i18nc("@text", "Suitable for engineering work") - } _translations["smooth"] = { "name": catalog.i18nc("@label", "Smooth"), "description": catalog.i18nc("@text", "Optimized for a smooth surfaces") } + ## Creates a new model for a certain intent category. # \param The category to list the intent profiles for. def __init__(self, intent_category: str) -> None: From 355ebd4e71f332cb97a1b3965b47636488a92cb7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Oct 2019 13:20:35 +0100 Subject: [PATCH 819/994] Remove override for prime tower position The formula in the fdmprinter definition does it's job, so no need to change it! CURA-6943 --- resources/definitions/ultimaker_s3.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 7348c14a2a..efdc7cca0a 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -67,8 +67,6 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "value": "345" }, - "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": From 1af1a8ddcb13ab2a472ace4dc7b1f4ab59d7802f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 31 Oct 2019 13:26:49 +0100 Subject: [PATCH 820/994] Rename "smooth" intent to draft CURA-6890 --- cura/Machines/Models/IntentCategoryModel.py | 8 ++++---- .../um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 20d07864bf..a968d12b7a 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -41,11 +41,11 @@ class IntentCategoryModel(ListModel): } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "Suitable for engineering work") + "description": catalog.i18nc("@text", "Optimized for higher accuracy") } - _translations["smooth"] = { - "name": catalog.i18nc("@label", "Smooth"), - "description": catalog.i18nc("@text", "Optimized for a smooth surfaces") + _translations["quick"] = { + "name": catalog.i18nc("@label", "Draft"), + "description": catalog.i18nc("@text", "Optimized for fast results") } diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index b41f636e63..92d91840b5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s3 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 8095a53141..1d990b83c0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s3 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index edae808491..020a4bbc99 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s3 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index f627fbf74b..14bb0e0f54 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s5 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 553a68201d..86062ecf19 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s5 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 458b283dd8..3a6e19c64c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker_s5 [metadata] setting_version = 10 type = intent -intent_category = smooth +intent_category = quick quality_type = draft material = generic_tough_pla variant = AA 0.4 From e5fb9fb8cfa1fb090d3e91b796a27b1a6b8c0213 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 31 Oct 2019 14:59:54 +0100 Subject: [PATCH 821/994] Remove hack used to draw some build area edge border This disallowed area should not exist and caused difference in behavior between all-at-once and one-at-a-time printing for a single object CURA-6522 --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index bc8c806699..7928b0243a 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1103,7 +1103,7 @@ class BuildVolume(SceneNode): # If we are printing one at a time, we need to add the bed adhesion size to the disallowed areas of the objects if container_stack.getProperty("print_sequence", "value") == "one_at_a_time": - return 0.1 # Return a very small value, so we do draw disallowed area's near the edges. + return 0 bed_adhesion_size = self._calculateBedAdhesionSize(used_extruders) support_expansion = self._calculateSupportExpansion(self._global_container_stack) From 6971e1f9cf8583f5d9885427f279cee7d34dafd2 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 31 Oct 2019 15:01:24 +0100 Subject: [PATCH 822/994] Add clarifying documentation to getConvexHull CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 72e95c9299..7c886d59c6 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -88,7 +88,8 @@ class ConvexHullDecorator(SceneNodeDecorator): return self._add2DAdhesionMargin(hull) - ## Get the unmodified 2D projected convex hull with 2D adhesion area of the node (if any) + ## Get the unmodified 2D projected convex hull of the node (if any) + # In case of all-at-once, this includes adhesion and head+fans clearance def getConvexHull(self) -> Optional[Polygon]: if self._node is None: return None From 5c3167be0730854706f846e43d2377e4f9cbbdae Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Thu, 31 Oct 2019 15:15:30 +0100 Subject: [PATCH 823/994] Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg --- ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 ------------------ 1 file changed, 117 deletions(-) delete mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg deleted file mode 100644 index 6f91548dda..0000000000 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg +++ /dev/null @@ -1,117 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_epla_natural - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 50 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 50 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 -acceleration_enabled = True - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 4 -cool_min_layer_time = 5 -cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file From b388246659d54e8778912c9f75f52629830f5dcf Mon Sep 17 00:00:00 2001 From: WalshJames <36920227+WalshJames@users.noreply.github.com> Date: Thu, 31 Oct 2019 15:15:50 +0100 Subject: [PATCH 824/994] Add files via upload --- ...og_Bolt_Pro_epla_natural_standard.inst.cfg | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg new file mode 100644 index 0000000000..85a4bc80c3 --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg @@ -0,0 +1,117 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_epla_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 50 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 +acceleration_enabled = False + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From 249a66ebd9d4d8c5ae9f02a881c7b02b1a7aaae1 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 31 Oct 2019 16:38:00 +0100 Subject: [PATCH 825/994] Merge machine_head_polygon and machine_head_with_fans_polygon defs. There is no usecase for having both. when a definition has both, the head is removed. when it has only head, it is renamed to _with_fans CURA-6522 --- resources/definitions/builder_premium_large.def.json | 2 +- resources/definitions/builder_premium_medium.def.json | 2 +- resources/definitions/builder_premium_small.def.json | 2 +- resources/definitions/creality_cr10.def.json | 7 ------- resources/definitions/creality_cr10max.def.json | 7 ------- resources/definitions/creality_cr10mini.def.json | 7 ------- resources/definitions/creality_cr10s4.def.json | 7 ------- resources/definitions/creality_cr10s5.def.json | 7 ------- resources/definitions/creality_cr10spro.def.json | 7 ------- resources/definitions/creality_cr20.def.json | 7 ------- resources/definitions/creality_ender2.def.json | 7 ------- resources/definitions/creality_ender3.def.json | 7 ------- resources/definitions/creality_ender4.def.json | 7 ------- resources/definitions/creality_ender5.def.json | 7 ------- resources/definitions/creality_ender5plus.def.json | 7 ------- resources/definitions/fdmprinter.def.json | 2 +- resources/definitions/geeetech_a30.def.json | 8 -------- resources/definitions/grr_neo.def.json | 2 +- resources/definitions/innovo_inventor.def.json | 2 +- resources/definitions/key3d_tyro.def.json | 2 +- resources/definitions/makeR_pegasus.def.json | 2 +- resources/definitions/makeR_prusa_tairona_i3.def.json | 2 +- resources/definitions/nwa3d_a31.def.json | 2 +- resources/definitions/nwa3d_a5.def.json | 2 +- resources/definitions/prusa_i3.def.json | 8 -------- resources/definitions/prusa_i3_xl.def.json | 2 +- resources/definitions/punchtec_connect_xl.def.json | 2 +- resources/definitions/rigid3d.def.json | 2 +- resources/definitions/rigid3d_3rdgen.def.json | 2 +- resources/definitions/rigid3d_hobby.def.json | 2 +- resources/definitions/rigid3d_zero.def.json | 2 +- resources/definitions/tevo_tarantula.def.json | 2 +- resources/definitions/tevo_tornado.def.json | 2 +- resources/definitions/vertex_k8400.def.json | 8 -------- resources/definitions/vertex_k8400_dual.def.json | 8 -------- 35 files changed, 19 insertions(+), 135 deletions(-) diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index e5411027e3..d19382a591 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -88,7 +88,7 @@ "adhesion_type": { "default_value": "skirt" }, "machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 1817dfe7db..e5b8f1785c 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -88,7 +88,7 @@ "adhesion_type": { "default_value": "skirt" }, "machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index f126da7752..4bcbd7d526 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -87,7 +87,7 @@ "adhesion_type": { "default_value": "skirt" }, "machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index 0a08c56cc6..85e0f0a435 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10max.def.json b/resources/definitions/creality_cr10max.def.json index cc7dfa6faf..a7e40d5bfc 100644 --- a/resources/definitions/creality_cr10max.def.json +++ b/resources/definitions/creality_cr10max.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 450 }, "machine_depth": { "default_value": 450 }, "machine_height": { "default_value": 470 }, - "machine_head_polygon": { "default_value": [ - [-44, 34], - [-44, -34], - [18, -34], - [18, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-44, 34], [-44, -34], diff --git a/resources/definitions/creality_cr10mini.def.json b/resources/definitions/creality_cr10mini.def.json index bdc0d4406e..621be5f0f3 100644 --- a/resources/definitions/creality_cr10mini.def.json +++ b/resources/definitions/creality_cr10mini.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10s4.def.json b/resources/definitions/creality_cr10s4.def.json index 593a526fc3..ccecd41a1d 100644 --- a/resources/definitions/creality_cr10s4.def.json +++ b/resources/definitions/creality_cr10s4.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10s5.def.json b/resources/definitions/creality_cr10s5.def.json index 91469deb7f..105e1d0458 100644 --- a/resources/definitions/creality_cr10s5.def.json +++ b/resources/definitions/creality_cr10s5.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 500 }, "machine_depth": { "default_value": 500 }, "machine_height": { "default_value": 500 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10spro.def.json b/resources/definitions/creality_cr10spro.def.json index 86897e711a..28c8dda0a5 100644 --- a/resources/definitions/creality_cr10spro.def.json +++ b/resources/definitions/creality_cr10spro.def.json @@ -5,13 +5,6 @@ "overrides": { "machine_name": { "default_value": "Creality CR-10S Pro" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, - "machine_head_polygon": { "default_value": [ - [-44, 34], - [-44, -34], - [18, -34], - [18, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-44, 34], [-44, -34], diff --git a/resources/definitions/creality_cr20.def.json b/resources/definitions/creality_cr20.def.json index af027f2452..b18c2709e6 100644 --- a/resources/definitions/creality_cr20.def.json +++ b/resources/definitions/creality_cr20.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 250 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender2.def.json b/resources/definitions/creality_ender2.def.json index 55b2e88478..2a5e14c828 100644 --- a/resources/definitions/creality_ender2.def.json +++ b/resources/definitions/creality_ender2.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, "machine_height": { "default_value": 200 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 645be52bc8..691d590caa 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -12,13 +12,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 250 }, - "machine_head_polygon": { "default_value": [ - [-1, 1], - [-1, -1], - [1, -1], - [1, 1] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender4.def.json b/resources/definitions/creality_ender4.def.json index 6962be558e..9c13797c92 100644 --- a/resources/definitions/creality_ender4.def.json +++ b/resources/definitions/creality_ender4.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 452 }, "machine_depth": { "default_value": 468 }, "machine_height": { "default_value": 482 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index c1511884ae..1b4be4d71f 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender5plus.def.json b/resources/definitions/creality_ender5plus.def.json index da4e2af635..48ebad61ea 100644 --- a/resources/definitions/creality_ender5plus.def.json +++ b/resources/definitions/creality_ender5plus.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 350 }, "machine_depth": { "default_value": 350 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8511d9e969..6fe5206cae 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -411,7 +411,7 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "machine_head_polygon": + "machine_head_with_fans_polygon": { "label": "Machine Head Polygon", "description": "A 2D silhouette of the print head (fan caps excluded).", diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index a700f4e473..1f08d37445 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -59,14 +59,6 @@ "adhesion_type": { "default_value": "skirt" }, - "machine_head_polygon": { - "default_value": [ - [-75, 35], - [18, 35], - [18, -18], - [-75, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-75, 35], diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index b3a558825a..774a3e614c 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -28,7 +28,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 13a8a7c59b..df839b0fe4 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": true }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-43.7, -19.2], [-43.7, 55], diff --git a/resources/definitions/key3d_tyro.def.json b/resources/definitions/key3d_tyro.def.json index e14f601d7d..0bfc78c115 100644 --- a/resources/definitions/key3d_tyro.def.json +++ b/resources/definitions/key3d_tyro.def.json @@ -32,7 +32,7 @@ "machine_depth": { "default_value": 150 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index 6b19544612..63f76194a4 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index c7e7f4079d..3c57c0cbc8 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json index 6463ac2ca4..1cfd02fe7f 100644 --- a/resources/definitions/nwa3d_a31.def.json +++ b/resources/definitions/nwa3d_a31.def.json @@ -34,7 +34,7 @@ "machine_depth": { "default_value": 300 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 4309e07184..1631860d47 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -32,7 +32,7 @@ "machine_depth": { "default_value": 150 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 581de6fd98..267a7ba4e6 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -31,14 +31,6 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { - "default_value": [ - [-75, -18], - [-75, 35], - [18, 35], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index b9628b9430..dae1bdce4f 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -31,7 +31,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index b262daa445..9bae80b0ac 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -16,7 +16,7 @@ }, "overrides": { - "machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, "prime_tower_size": { "default_value": 8.660254037844387 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index a66559b393..ba90894f7d 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index b4d0252075..6e1a93fb40 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_gap": { "default_value": 5.0 }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index f50df0c47d..d89c1aeaff 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -15,7 +15,7 @@ }, "overrides": { - "machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, "prime_tower_size": { "default_value": 8.660254037844387 }, "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 15 }, diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 64909630d2..54bd2c3dca 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, "support_pattern": { "default_value": "grid" }, "cool_min_layer_time": { "default_value": 10 }, "support_angle": { "default_value": 45 }, diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index 038cc3a318..f4bf2b901e 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -23,7 +23,7 @@ "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": + "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/tevo_tornado.def.json b/resources/definitions/tevo_tornado.def.json index 67f25ec9d8..3b6c431feb 100644 --- a/resources/definitions/tevo_tornado.def.json +++ b/resources/definitions/tevo_tornado.def.json @@ -28,7 +28,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index dad50cffe8..b2a6374f83 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -35,14 +35,6 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { - "default_value": [ - [-60, -18], - [-60, 40], - [18, 40], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-60, -40], diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index f5c4921cfc..498d550429 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -36,14 +36,6 @@ "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_head_polygon": { - "default_value": [ - [-60, -18], - [-60, 40], - [18, 40], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-60, -40], From b6fc8523f3c6b9e82a93647a782414b918a8e699 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 31 Oct 2019 16:40:32 +0100 Subject: [PATCH 826/994] refactor ConvexHullDecorator.getConvexHull CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 7c886d59c6..d3bd3be61f 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -95,14 +95,16 @@ class ConvexHullDecorator(SceneNodeDecorator): return None if self._node.callDecoration("isNonPrintingMesh"): return None - hull = self._compute2DConvexHull() - if self._global_stack and self._node is not None and hull is not None: - # Parent can be None if node is just loaded. - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): - hull = hull.getMinkowskiHull(Polygon(numpy.array(self._global_stack.getProperty("machine_head_polygon", "value"), numpy.float32))) - hull = self._add2DAdhesionMargin(hull) - return hull + # Parent can be None if node is just loaded. + if self._global_stack \ + and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ + and not self.hasGroupAsParent(self._node): + hull = self.getConvexHullHeadFull() + hull = self._add2DAdhesionMargin(hull) + return hull + + return self._compute2DConvexHull() ## Get the convex hull of the node with the full head size def getConvexHullHeadFull(self) -> Optional[Polygon]: From 05b1ce965889b330fc713a44e4de33995565ec94 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Thu, 31 Oct 2019 17:06:05 +0100 Subject: [PATCH 827/994] Removes 0.2mm layer height visual intent profiles --- .../um_s3_aa0.4_ABS_Draft_Visual.inst.cfg | 17 ----------------- .../um_s3_aa0.4_PLA_Draft_Visual.inst.cfg | 17 ----------------- .../um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg | 17 ----------------- .../um_s5_aa0.4_ABS_Draft_Visual.inst.cfg | 16 ---------------- .../um_s5_aa0.4_PLA_Draft_Visual.inst.cfg | 17 ----------------- .../um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg | 16 ---------------- 6 files changed, 100 deletions(-) delete mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg delete mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg delete mode 100644 resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg delete mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg delete mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg delete mode 100644 resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg deleted file mode 100644 index 49672fcb72..0000000000 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s3 - -[metadata] -setting_version = 10 -type = intent -intent_category = visual -quality_type = draft -material = generic_abs -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg deleted file mode 100644 index 0c39d43c6a..0000000000 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s3 - -[metadata] -setting_version = 10 -type = intent -quality_type = draft -intent_category = visual -material = generic_pla -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg deleted file mode 100644 index f52eb22ec2..0000000000 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s3 - -[metadata] -setting_version = 10 -type = intent -quality_type = draft -intent_category = visual -material = generic_tough_pla -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg deleted file mode 100644 index 4f7ee148f9..0000000000 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = visualquality_type = draft -material = generic_abs -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg deleted file mode 100644 index a71bb898d3..0000000000 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -quality_type = draft -intent_category = visual -material = generic_pla -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg deleted file mode 100644 index b522d262af..0000000000 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Visual -definition = ultimaker_s5 - -[metadata] -setting_version = 10 -type = intent -intent_category = visual -material = generic_tough_pla -variant = AA 0.4 - -[values] -speed_infill = 50 -wall_thickness = =wall_line_width * 3 -top_bottom_thickness = =wall_thickness From 5908ff60eeec16b135b2f1b401bda26d32e089a4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 31 Oct 2019 13:37:24 +0100 Subject: [PATCH 828/994] Move verification check from plugin to the import of containers. part of CURA-6856 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 752f17feb4..093638d594 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -15,9 +15,8 @@ import UM.Dictionary from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry from UM.ConfigurationErrorMessage import ConfigurationErrorMessage -from UM.Trust import Trust -from cura.CuraApplication import ApplicationMetadata, CuraApplication +from cura.CuraApplication import CuraApplication from cura.Machines.ContainerTree import ContainerTree from cura.Machines.VariantType import VariantType @@ -471,17 +470,6 @@ class XmlMaterialProfile(InstanceContainer): ## Overridden from InstanceContainer def deserialize(self, serialized, file_name = None): - - # NOTE: In an enterprise environment, IT might not trust every material package the user installs. - # In that case, check if this package is trusted first, and return prematurely if not. - if file_name is not None and ApplicationMetadata.CuraIsEnterpriseVersion: - from UM.Application import Application - install_prefix = os.path.abspath(Application.getInstallPrefix()) - common_path = os.path.commonpath([install_prefix, file_name]) - if common_path is None or not common_path.startswith(install_prefix): - if not Trust.getInstance().signedFileCheck(file_name): - raise Exception("Trust-check failed for material file {0}.".format(file_name)) - containers_to_add = [] # update the serialized data first from UM.Settings.Interfaces import ContainerInterface From aca7f4551e84b4a53e7250844942e51c552416c9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 31 Oct 2019 19:01:23 +0100 Subject: [PATCH 829/994] Make verified material containers read-only, even for variants. part CURA-6856 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 093638d594..3812c5255c 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -720,6 +720,8 @@ class XmlMaterialProfile(InstanceContainer): new_hotend_material._dirty = False if is_new_material: + if ContainerRegistry.getInstance().isReadOnly(self.getId()): + ContainerRegistry.getInstance().setReadOnlyExplicitly(new_hotend_material.getId()) containers_to_add.append(new_hotend_material) # there is only one ID for a machine. Once we have reached here, it means we have already found From 2818a24516bdc1c1c7ad45c7ee49583731abb573 Mon Sep 17 00:00:00 2001 From: Kaz Date: Fri, 1 Nov 2019 11:40:39 +0800 Subject: [PATCH 830/994] Update Makeblock mCreate define files name --- .../{makeblock.def.json => makeblock_mcreate.def.json} | 6 +++--- ...der_0.def.json => makeblock_mcreate_extruder_0.def.json} | 4 ++-- ...ormal.inst.cfg => makeblock_mcreate_pla_normal.inst.cfg} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename resources/definitions/{makeblock.def.json => makeblock_mcreate.def.json} (94%) rename resources/extruders/{makeblock_extruder_0.def.json => makeblock_mcreate_extruder_0.def.json} (90%) rename resources/quality/makeblock/{makeblock_pla_normal.inst.cfg => makeblock_mcreate_pla_normal.inst.cfg} (86%) diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock_mcreate.def.json similarity index 94% rename from resources/definitions/makeblock.def.json rename to resources/definitions/makeblock_mcreate.def.json index 5697a42a73..db66ee4be5 100644 --- a/resources/definitions/makeblock.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makeblock", + "name": "Makeblock mCreate", "inherits": "fdmprinter", "metadata": { "author": "Makeblock", @@ -10,12 +10,12 @@ "has_machine_quality": true, "preferred_quality_type": "normal", "machine_extruder_trains": { - "0": "makeblock_extruder_0" + "0": "makeblock_mcreate_extruder_0" } }, "overrides": { "machine_name": { - "default_value": "makeblock" + "default_value": "Makeblock mCreate" }, "machine_width": { "default_value": 225 diff --git a/resources/extruders/makeblock_extruder_0.def.json b/resources/extruders/makeblock_mcreate_extruder_0.def.json similarity index 90% rename from resources/extruders/makeblock_extruder_0.def.json rename to resources/extruders/makeblock_mcreate_extruder_0.def.json index 138ae09a0b..aba794f40d 100644 --- a/resources/extruders/makeblock_extruder_0.def.json +++ b/resources/extruders/makeblock_mcreate_extruder_0.def.json @@ -4,7 +4,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "makeblock", + "machine": "makeblock_mcreate", "position": "0" }, "overrides": { @@ -18,4 +18,4 @@ "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg similarity index 86% rename from resources/quality/makeblock/makeblock_pla_normal.inst.cfg rename to resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg index 5bcfc58f63..661695cca0 100644 --- a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg +++ b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Fine -definition = makeblock +definition = makeblock_mcreate [metadata] setting_version = 6 @@ -17,4 +17,4 @@ material_final_print_temperature = 185 material_flow = 94 retraction_speed = 55 skirt_line_count = 2 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt From e5c9bca3d072318fbcaedc41e7ab9dabe16ec7c5 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 09:57:51 +0100 Subject: [PATCH 831/994] Fix TestBuildVolume CURA-6522 --- tests/TestBuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 6ccb3d0fb7..4beb648c89 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -386,5 +386,5 @@ class TestGetEdgeDisallowedSize: build_volume._global_container_stack = self.createMockedStack() with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"): with patch.dict(self.setting_property_dict, {"print_sequence": {"value": "one_at_a_time"}}): - assert build_volume.getEdgeDisallowedSize() == 0.1 + assert build_volume.getEdgeDisallowedSize() == 0.0 From 88b3a2506daf4e531317882c8e8cdad2fe6530bd Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 09:58:47 +0100 Subject: [PATCH 832/994] Version Upgrade 44 to 45 Includes test for changes made in CURA-6522 CURA-6522 --- .../VersionUpgrade44to45.py | 69 +++++++++++++++++++ .../VersionUpgrade44to45/__init__.py | 61 ++++++++++++++++ .../VersionUpgrade44to45/plugin.json | 8 +++ .../tests/TestVersionUpgrade44To45.py | 42 +++++++++++ 4 files changed, 180 insertions(+) create mode 100644 plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade44to45/__init__.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json create mode 100644 plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py new file mode 100644 index 0000000000..36ee2bac16 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py @@ -0,0 +1,69 @@ +import configparser +from typing import Tuple, List +import io +from UM.VersionUpgrade import VersionUpgrade + +# Merged preferences: machine_head_polygon and machine_head_with_fans_polygon -> machine_head_with_fans_polygon +# When both are present, machine_head_polygon will be removed +# When only one of the two is present, it's value will be used + + +class VersionUpgrade44to45(VersionUpgrade): + def getCfgVersion(self, serialised: str) -> int: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialised) + format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. + setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) + return format_version * 1000000 + setting_version + + ## Upgrades Preferences to have the new version number. + # + # This renames the renamed settings in the list of visible settings. + def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "11" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades instance containers to have the new version + # number. + # + # This renames the renamed settings in the containers. + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "11" + + if "values" in parser: + # merge machine_head_with_fans_polygon (preferred) and machine_head_polygon + if "machine_head_with_fans_polygon" in parser["values"]: + if "machine_head_polygon" in parser["values"]: + del parser["values"]["machine_head_polygon"] + elif "machine_head_polygon" in parser["values"]: + parser["values"]["machine_head_with_fans_polygon"] = parser["values"]["machine_head_polygon"] + del parser["values"]["machine_head_polygon"] + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades stacks to have the new version number. + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + if "metadata" not in parser: + parser["metadata"] = {} + parser["metadata"]["setting_version"] = "11" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/__init__.py b/plugins/VersionUpgrade/VersionUpgrade44to45/__init__.py new file mode 100644 index 0000000000..06a9d66c50 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/__init__.py @@ -0,0 +1,61 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade44to45 + + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade44to45.VersionUpgrade44to45() + + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("preferences", 6000010): ("preferences", 6000011, upgrade.upgradePreferences), + ("machine_stack", 4000010): ("machine_stack", 4000011, upgrade.upgradeStack), + ("extruder_train", 4000010): ("extruder_train", 4000011, upgrade.upgradeStack), + ("definition_changes", 4000010): ("definition_changes", 4000011, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000010): ("quality_changes", 4000011, upgrade.upgradeInstanceContainer), + ("quality", 4000010): ("quality", 4000011, upgrade.upgradeInstanceContainer), + ("user", 4000010): ("user", 4000011, upgrade.upgradeInstanceContainer), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json new file mode 100644 index 0000000000..f7b6157118 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.4 to 4.5", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.", + "api": "7.0", + "i18n-catalog": "cura" +} diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py new file mode 100644 index 0000000000..60b5494f84 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py @@ -0,0 +1,42 @@ +import configparser + +import VersionUpgrade44to45 +import pytest + +before_update = """[general] +version = 4 +name = Creality CR-10S_settings +definition = creality_cr10s + +[metadata] +type = definition_changes +setting_version = 10 + +[values] +%s +""" +before_after_list = [ + ("machine_head_with_fans_polygon = [[-99, 99], [-99, -44], [45, 99], [45, -44]]", "[[-99, 99], [-99, -44], [45, 99], [45, -44]]"), + ("", None), + ("machine_head_polygon = [[-98, 99], [-99, -44], [45, 99], [45, -44]]", "[[-98, 99], [-99, -44], [45, 99], [45, -44]]"), + ("machine_head_polygon = [[-87, 99], [-99, -44], [45, 99], [45, -44]]\nmachine_head_with_fans_polygon = [[-99, 99], [-99, -44], [45, 99], [45, -44]]", "[[-99, 99], [-99, -44], [45, 99], [45, -44]]"), + ] + + +class TestVersionUpgrade44to45: + + @pytest.mark.parametrize("after_string, after_value", before_after_list) + def test_upgrade(self, after_string, after_value): + upgrader = VersionUpgrade44to45.VersionUpgrade44to45() + + + file_name, new_data = upgrader.upgradeInstanceContainer(before_update % after_string, "whatever") + parser = configparser.ConfigParser(interpolation=None) + parser.read_string(new_data[0]) + + if after_value is None: + assert "machine_head_with_fans_polygon" not in parser["values"] + else: + assert parser["values"]["machine_head_with_fans_polygon"] == after_value + + assert "machine_head_polygon" not in parser["values"] \ No newline at end of file From 90f580494b2445abd013bf73ddd1a5762b2e5517 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 10:31:07 +0100 Subject: [PATCH 833/994] Change default image reader algorithm from logarithmic to linear The log curve might have some benefits but is also harder to understand and configure, so let's keep the default at linear. CURA-6540 --- plugins/ImageReader/ConfigUI.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 72ad79c05e..0429fae4e1 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -158,7 +158,7 @@ UM.Dialog ComboBox { id: color_model objectName: "ColorModel" - model: [ catalog.i18nc("@item:inlistbox","Translucency"), catalog.i18nc("@item:inlistbox","Linear") ] + model: [ catalog.i18nc("@item:inlistbox","Linear"), catalog.i18nc("@item:inlistbox","Translucency") ] width: 180 * screenScaleFactor onCurrentIndexChanged: { manager.onColorModelChanged(currentIndex) } } From b919be48bc241a485d008a1c4093646eb4459da1 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 1 Nov 2019 10:50:02 +0100 Subject: [PATCH 834/994] Introduce new API call for fetching package updates --- plugins/Toolbox/src/Toolbox.py | 41 +++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 08b6c80b1d..c63d36d8c4 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -48,7 +48,7 @@ class Toolbox(QObject, Extension): self._download_progress = 0 # type: float self._is_downloading = False # type: bool self._network_manager = None # type: Optional[QNetworkAccessManager] - self._request_headers = [] # type: List[Tuple[bytes, bytes]] + self._request_headers = [] # type: List[Tuple[bytes, bytes]] self._updateRequestHeader() self._request_urls = {} # type: Dict[str, QUrl] @@ -59,13 +59,15 @@ class Toolbox(QObject, Extension): # The responses as given by the server parsed to a list. self._server_response_data = { "authors": [], - "packages": [] + "packages": [], + "updates": [], } # type: Dict[str, List[Any]] # Models: self._models = { "authors": AuthorsModel(self), "packages": PackagesModel(self), + "updates": PackagesModel(self), } # type: Dict[str, Union[AuthorsModel, PackagesModel]] self._plugins_showcase_model = PackagesModel(self) @@ -186,18 +188,22 @@ class Toolbox(QObject, Extension): cloud_api_version = self._cloud_api_version, sdk_version = self._sdk_version ) + + installed_package_ids_with_versions = [":".join(items) for items in + self._package_manager.getAllInstalledPackageIdsAndVersions()] + installed_packages_query = ",".join(installed_package_ids_with_versions) self._request_urls = { "authors": QUrl("{base_url}/authors".format(base_url = self._api_url)), - "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)) + "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)), + "updates": QUrl("{base_url}/packages/package-updates?installed_packages={query}".format( + base_url = self._api_url, query = installed_packages_query)) } - # Request the latest and greatest! - self._fetchPackageData() + # On boot we check which packages have updates. + if len(installed_package_ids_with_versions) > 0: + self._fetchPackageUpdates() - def _fetchPackageData(self): - # Create the network manager: - # This was formerly its own function but really had no reason to be as - # it was never called more than once ever. + def _prepareNetworkManager(self): if self._network_manager is not None: self._network_manager.finished.disconnect(self._onRequestFinished) self._network_manager.networkAccessibleChanged.disconnect(self._onNetworkAccessibleChanged) @@ -205,10 +211,15 @@ class Toolbox(QObject, Extension): self._network_manager.finished.connect(self._onRequestFinished) self._network_manager.networkAccessibleChanged.connect(self._onNetworkAccessibleChanged) + def _fetchPackageUpdates(self): + self._prepareNetworkManager() + self._makeRequestByType("updates") + + def _fetchPackageData(self): + self._prepareNetworkManager() # Make remote requests: self._makeRequestByType("packages") self._makeRequestByType("authors") - # Gather installed packages: self._updateInstalledModels() @@ -234,7 +245,7 @@ class Toolbox(QObject, Extension): if not plugin_path: return None path = os.path.join(plugin_path, "resources", "qml", qml_name) - + dialog = self._application.createQmlComponent(path, {"toolbox": self}) if not dialog: raise Exception("Failed to create Marketplace dialog") @@ -618,7 +629,7 @@ class Toolbox(QObject, Extension): if not self._models[response_type]: Logger.log("e", "Could not find the %s model.", response_type) break - + self._server_response_data[response_type] = json_data["data"] self._models[response_type].setMetadata(self._server_response_data[response_type]) @@ -630,6 +641,10 @@ class Toolbox(QObject, Extension): elif response_type == "authors": self._models[response_type].setFilter({"package_types": "material"}) self._models[response_type].setFilter({"tags": "generic"}) + elif response_type == "updates": + # Tell the package manager that there's a new set of updates available. + packages = set([pkg["package_id"] for pkg in self._server_response_data[response_type]]) + self._package_manager.setPackagesWithUpdate(packages) self.metadataChanged.emit() @@ -660,7 +675,7 @@ class Toolbox(QObject, Extension): self.setIsDownloading(False) self._download_reply = cast(QNetworkReply, self._download_reply) self._download_reply.downloadProgress.disconnect(self._onDownloadProgress) - + # Check if the download was sucessfull if self._download_reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) != 200: try: From 96bd641d93290ca38fea33667a4c64f780c52ecb Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 11:06:16 +0100 Subject: [PATCH 835/994] Fix: upper/lower handle not losing focus when range handle pressed --- plugins/SimulationView/LayerSlider.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index eff27c43a7..0c62dd01cf 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -155,7 +155,11 @@ Item } onPositionChanged: parent.onHandleDragged() - onPressed: sliderRoot.setActiveHandle(rangeHandle) + onPressed: + { + sliderRoot.setActiveHandle(rangeHandle) + sliderRoot.forceActiveFocus() + } } } From eaedca191743513095a8b2fc82fde42b32561f29 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 11:54:17 +0100 Subject: [PATCH 836/994] Convert unit of adaptive layers threshold and change name This usage is hopefully more intuitive than the previous one. --- .../VersionUpgrade43to44/VersionUpgrade43to44.py | 7 +++++++ resources/definitions/fdmprinter.def.json | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index e8eefb1bb0..40927fe3a0 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -66,6 +66,13 @@ class VersionUpgrade43to44(VersionUpgrade): # Alternate skin rotation should be translated to top/bottom line directions. if "skin_alternate_rotation" in parser["values"] and parseBool(parser["values"]["skin_alternate_rotation"]): parser["values"]["skin_angles"] = "[45, 135, 0, 90]" + # Unit of adaptive layers topography size changed. + if "adaptive_layer_height_threshold" in parser["values"]: + val = parser["values"]["adaptive_layer_height_threshold"] + if val.startswith("="): + val = val[1:] + val = "=({val}) / 1000".format(val = val) # Convert microns to millimetres. Works even if the profile contained a formula. + parser["values"]["adaptive_layer_height_threshold"] = val result = io.StringIO() parser.write(result) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8511d9e969..90d6c8e2d8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7074,11 +7074,12 @@ }, "adaptive_layer_height_threshold": { - "label": "Adaptive Layers Threshold", - "description": "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer.", + "label": "Adaptive Layers Topography Size", + "description": "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together.", "type": "float", "enabled": "adaptive_layer_height_enabled", - "default_value": 200.0, + "default_value": 0.2, + "unit": "mm", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false From 36d4162f35a26a8fa738cca07ea3f12df33d3439 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 13:19:16 +0100 Subject: [PATCH 837/994] Fix fallback to global if extruder_nr doesn't exist Fixes #6590. --- plugins/CuraEngineBackend/StartSliceJob.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 29a6d8ff30..43d54d8b12 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import numpy @@ -72,7 +72,7 @@ class GcodeStartEndFormatter(Formatter): value = default_value_str # "-1" is global stack, and if the setting value exists in the global stack, use it as the fallback value. if key in kwargs["-1"]: - value = kwargs["-1"] + value = kwargs["-1"][key] if str(extruder_nr) in kwargs and key in kwargs[str(extruder_nr)]: value = kwargs[str(extruder_nr)][key] From 315b93a1525ba53f520f12b09669668266f12c6c Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 13:54:52 +0100 Subject: [PATCH 838/994] Draw the NoIntentIcon over the intent description hover area. This fixes a bug where the NoIntent tooltip was hidden by the intent description CURA-6936 --- .../RecommendedQualityProfileSelector.qml | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 3c7caad470..5e58faec78 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -124,18 +124,6 @@ Item elide: Text.ElideRight } - NoIntentIcon - { - affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent - intent_type: model.name - anchors.right: intentCategoryLabel.right - anchors.rightMargin: UM.Theme.getSize("narrow_margin").width - width: intentCategoryLabel.height * 0.75 - anchors.verticalCenter: parent.verticalCenter - height: width - visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length - } - Cura.RadioCheckbar { anchors @@ -164,8 +152,9 @@ Item isCheckedFunction: checkedFunction } - MouseArea // tooltip hover area + MouseArea // Intent description tooltip hover area { + id: intentDescriptionHoverArea anchors.fill: parent hoverEnabled: true enabled: model.description !== undefined @@ -181,6 +170,20 @@ Item } onExited: base.hideTooltip() } + + NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it. + { + affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent + intent_type: model.name + anchors.right: intentCategoryLabel.right + anchors.rightMargin: UM.Theme.getSize("narrow_margin").width + width: intentCategoryLabel.height * 0.75 + anchors.verticalCenter: parent.verticalCenter + height: width + visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length + } + + } } From 852da51f6550aa5bad9257bcfacc3bbde369fc3e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 13:56:10 +0100 Subject: [PATCH 839/994] Fix tests for exact matching on preferred material I don't know why the CI system was only complaining about it several commits later. Could be troublesome. Fixes a bug introduced by 1284d9fe8d726e46b556caa8f2f390dc7d65220c. --- tests/Machines/TestVariantNode.py | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index bc860058a1..8ccde9bc74 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -137,38 +137,17 @@ def test_materialAdded_update(container_registry, machine_node, metadata, change def test_preferredMaterialExactMatch(empty_variant_node): empty_variant_node.materials = { "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), - "preferred_material_base_file": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. + "preferred_material": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. } - assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." - -## Tests the preferred material when a submaterial is available in the -# materials list for this node. -def test_preferredMaterialSubmaterial(empty_variant_node): - empty_variant_node.materials = { - "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), - "preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material. - } - - assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well." - -## Tests the preferred material matching on the approximate diameter of the -# filament. -def test_preferredMaterialDiameter(empty_variant_node): - empty_variant_node.materials = { - "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), - "preferred_material_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3. - "preferred_material_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. - } - - assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." + assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material"], "It should match exactly on this one since it's the preferred material." ## Tests the preferred material matching on a different material if the # diameter is wrong. def test_preferredMaterialDiameterNoMatch(empty_variant_node): empty_variant_node.materials = collections.OrderedDict() empty_variant_node.materials["some_different_material"] = MagicMock(getMetaDataEntry = lambda x: 3) # This one first so that it gets iterated over first. - empty_variant_node.materials["preferred_material_wrong_diameter"] = MagicMock(getMetaDataEntry = lambda x: 2) + empty_variant_node.materials["preferred_material"] = MagicMock(getMetaDataEntry = lambda x: 2) # Wrong diameter. assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["some_different_material"], "It should match on another material with the correct diameter if the preferred one is unavailable." @@ -177,7 +156,7 @@ def test_preferredMaterialDiameterNoMatch(empty_variant_node): def test_preferredMaterialDiameterPreference(empty_variant_node): empty_variant_node.materials = collections.OrderedDict() empty_variant_node.materials["some_different_material"] = MagicMock(getMetaDataEntry = lambda x: 2) # This one first so that it gets iterated over first. - empty_variant_node.materials["preferred_material_wrong_diameter"] = MagicMock(getMetaDataEntry = lambda x: 2) # Matches on ID but not diameter. + empty_variant_node.materials["preferred_material"] = MagicMock(getMetaDataEntry = lambda x: 2) # Matches on ID but not diameter. empty_variant_node.materials["not_preferred_but_correct_diameter"] = MagicMock(getMetaDataEntry = lambda x: 3) # Matches diameter but not ID. assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["not_preferred_but_correct_diameter"], "It should match on the correct diameter even if it's not the preferred one." \ No newline at end of file From 174b326f579b7da41974c70a0c8d2fa5bcd4a789 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 14:18:35 +0100 Subject: [PATCH 840/994] Also test validity and correctness of extruder definitions This makes a few things slightly simpler as well since it now parameterises the tests with the entire path of the definition file so we don't have to reconstruct that in every test. --- tests/Settings/TestDefinitionContainer.py | 33 ++++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 6e502280cd..2e0675f691 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -17,6 +17,10 @@ Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), machine_filepaths = sorted(os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions"))) +machine_filepaths = [os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", filename) for filename in machine_filepaths] +extruder_filepaths = sorted(os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "extruders"))) +extruder_filepaths = [os.path.join(os.path.dirname(__file__), "..", "..", "resources", "extruders", filename) for filename in extruder_filepaths] +definition_filepaths = machine_filepaths + extruder_filepaths all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes")) all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images")) @@ -29,17 +33,16 @@ def definition_container(): ## Tests all definition containers -@pytest.mark.parametrize("file_name", machine_filepaths) -def test_validateMachineDefinitionContainer(file_name, definition_container): +@pytest.mark.parametrize("file_path", definition_filepaths) +def test_validateMachineDefinitionContainer(file_path, definition_container): + file_name = os.path.basename(file_path) if file_name == "fdmprinter.def.json" or file_name == "fdmextruder.def.json": return # Stop checking, these are root files. - definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions") - assertIsDefinitionValid(definition_container, definition_path, file_name) + assertIsDefinitionValid(definition_container, file_path) - -def assertIsDefinitionValid(definition_container, path, file_name): - with open(os.path.join(path, file_name), encoding = "utf-8") as data: +def assertIsDefinitionValid(definition_container, file_path): + with open(file_path, encoding = "utf-8") as data: json = data.read() parser, is_valid = definition_container.readAndValidateSerialized(json) assert is_valid #The definition has invalid JSON structure. @@ -57,10 +60,9 @@ def assertIsDefinitionValid(definition_container, path, file_name): # When a definition container defines a "default_value" but inherits from a # definition that defines a "value", the "default_value" is ineffective. This # test fails on those things. -@pytest.mark.parametrize("file_name", machine_filepaths) -def test_validateOverridingDefaultValue(file_name: str): - definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name) - with open(definition_path, encoding = "utf-8") as f: +@pytest.mark.parametrize("file_path", machine_filepaths) +def test_validateOverridingDefaultValue(file_path: str): + with open(file_path, encoding = "utf-8") as f: doc = json.load(f) if "inherits" not in doc: @@ -70,7 +72,7 @@ def test_validateOverridingDefaultValue(file_name: str): parent_settings = getInheritedSettings(doc["inherits"]) for key, val in doc["overrides"].items(): if "value" in parent_settings[key]: - assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective. + assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_path) # If there is a value in the parent settings, then the default_value is not effective. ## Get all settings and their properties from a definition we're inheriting # from. @@ -130,10 +132,9 @@ def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, An # # ID fields are legacy. They should not be used any more. This is legacy that # people don't seem to be able to get used to. -@pytest.mark.parametrize("file_name", machine_filepaths) -def test_noId(file_name): - definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name) - with open(definition_path, encoding = "utf-8") as f: +@pytest.mark.parametrize("file_path", machine_filepaths) +def test_noId(file_path: str): + with open(file_path, encoding = "utf-8") as f: doc = json.load(f) assert "id" not in doc, "Definitions should not have an ID field." \ No newline at end of file From 6e6c510dcd50d60b798342b7d5c8cffe4824a3f9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 14:34:07 +0100 Subject: [PATCH 841/994] Test extruders for correctness but not for validity The validity can't be tested using the built-in validator since that one checks if there are no settings that 'override' non-existing settings. And some of the settings overridden in an extruder are not in the inheritance stack since fdmextruder doesn't inherit from fdmprinter. We'll check though that all settings that are overridden don't override a default_value while there is a value, and whether they don't have IDs. --- tests/Settings/TestDefinitionContainer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 2e0675f691..6590c488fc 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -33,7 +33,7 @@ def definition_container(): ## Tests all definition containers -@pytest.mark.parametrize("file_path", definition_filepaths) +@pytest.mark.parametrize("file_path", machine_filepaths) def test_validateMachineDefinitionContainer(file_path, definition_container): file_name = os.path.basename(file_path) if file_name == "fdmprinter.def.json" or file_name == "fdmextruder.def.json": @@ -60,7 +60,7 @@ def assertIsDefinitionValid(definition_container, file_path): # When a definition container defines a "default_value" but inherits from a # definition that defines a "value", the "default_value" is ineffective. This # test fails on those things. -@pytest.mark.parametrize("file_path", machine_filepaths) +@pytest.mark.parametrize("file_path", definition_filepaths) def test_validateOverridingDefaultValue(file_path: str): with open(file_path, encoding = "utf-8") as f: doc = json.load(f) @@ -71,7 +71,7 @@ def test_validateOverridingDefaultValue(file_path: str): return # No settings are being overridden. No need to check anything. parent_settings = getInheritedSettings(doc["inherits"]) for key, val in doc["overrides"].items(): - if "value" in parent_settings[key]: + if key in parent_settings and "value" in parent_settings[key]: assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_path) # If there is a value in the parent settings, then the default_value is not effective. ## Get all settings and their properties from a definition we're inheriting @@ -132,7 +132,7 @@ def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, An # # ID fields are legacy. They should not be used any more. This is legacy that # people don't seem to be able to get used to. -@pytest.mark.parametrize("file_path", machine_filepaths) +@pytest.mark.parametrize("file_path", definition_filepaths) def test_noId(file_path: str): with open(file_path, encoding = "utf-8") as f: doc = json.load(f) From 069dc6e65d35fcc4f1167619d1e101d9dec0a5be Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 14:52:41 +0100 Subject: [PATCH 842/994] Add test to see if definition's extruder number matches up ...with its machine definition's metadata. --- tests/Settings/TestDefinitionContainer.py | 34 ++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 6590c488fc..8bb7a754d3 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -137,4 +137,36 @@ def test_noId(file_path: str): with open(file_path, encoding = "utf-8") as f: doc = json.load(f) - assert "id" not in doc, "Definitions should not have an ID field." \ No newline at end of file + assert "id" not in doc, "Definitions should not have an ID field." + +## Verifies that extruders say that they work on the same extruder_nr as what +# is listed in their machine definition. +@pytest.mark.parametrize("file_path", extruder_filepaths) +def test_extruderMatch(file_path: str): + extruder_id = os.path.basename(file_path).split(".")[0] + with open(file_path, encoding = "utf-8") as f: + doc = json.load(f) + + if "metadata" not in doc: + return # May not be desirable either, but it's probably unfinished then. + if "machine" not in doc["metadata"] or "position" not in doc["metadata"]: + return # FDMextruder doesn't have this since it's not linked to a particular printer. + machine = doc["metadata"]["machine"] + position = doc["metadata"]["position"] + + # Find the machine definition. + for machine_filepath in machine_filepaths: + machine_id = os.path.basename(machine_filepath).split(".")[0] + if machine_id == machine: + break + else: + assert False, "The machine ID {machine} is not found.".format(machine = machine) + with open(machine_filepath, encoding = "utf-8") as f: + machine_doc = json.load(f) + + # Make sure that the two match up. + assert "metadata" in machine_doc, "Machine definition missing metadata entry." + assert "machine_extruder_trains" in machine_doc["metadata"], "Machine must define extruder trains." + extruder_trains = machine_doc["metadata"]["machine_extruder_trains"] + assert position in extruder_trains, "There must be a reference to the extruder in the machine definition." + assert extruder_trains[position] == extruder_id, "The extruder referenced in the machine definition must match up." \ No newline at end of file From d145945b25ba80273d0df9adeafe902522374924 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 15:02:14 +0100 Subject: [PATCH 843/994] Fix mistakes in extruder-definition inter-referencing --- resources/definitions/kupido.def.json | 4 +- .../extruders/bibo2_dual_extruder_0.def.json | 86 +++++++++---------- .../extruders/bibo2_dual_extruder_1.def.json | 86 +++++++++---------- resources/extruders/cr-x_extruder_0.def.json | 2 +- resources/extruders/cr-x_extruder_1.def.json | 2 +- .../creatable_d3_extruder_0.def.json | 2 +- .../hellbot_magna_i_extruder.def.json | 2 +- .../extruders/key3d_tyro_extruder_0.def.json | 2 +- 8 files changed, 93 insertions(+), 93 deletions(-) diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index a81a40542b..ad0182a5f6 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -18,12 +18,12 @@ "supports_usb_connection": false, "machine_extruder_trains": { - "0": "alya3dp_extruder_0" + "0": "kupido_extruder_0" } }, "overrides": { - "machine_name": { "default_value": "ALYA 3DP" }, + "machine_name": { "default_value": "KUPIDO" }, "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 195 }, "machine_height": { "default_value": 190 }, diff --git a/resources/extruders/bibo2_dual_extruder_0.def.json b/resources/extruders/bibo2_dual_extruder_0.def.json index b918d070be..91508ecc6d 100644 --- a/resources/extruders/bibo2_dual_extruder_0.def.json +++ b/resources/extruders/bibo2_dual_extruder_0.def.json @@ -1,45 +1,45 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "BIBO2 dual", - "position": "0" - }, - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": 0.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } - } + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bibo2_dual", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_nozzle_offset_x": { + "default_value": 0.0 + }, + "machine_nozzle_offset_y": { + "default_value": 0.0 + }, + "machine_extruder_start_pos_abs": { + "default_value": true + }, + "machine_extruder_start_pos_x": { + "value": "prime_tower_position_x" + }, + "machine_extruder_start_pos_y": { + "value": "prime_tower_position_y" + }, + "machine_extruder_end_pos_abs": { + "default_value": true + }, + "machine_extruder_end_pos_x": { + "value": "prime_tower_position_x" + }, + "machine_extruder_end_pos_y": { + "value": "prime_tower_position_y" + } + } } diff --git a/resources/extruders/bibo2_dual_extruder_1.def.json b/resources/extruders/bibo2_dual_extruder_1.def.json index e0386188bb..129ad27273 100644 --- a/resources/extruders/bibo2_dual_extruder_1.def.json +++ b/resources/extruders/bibo2_dual_extruder_1.def.json @@ -1,45 +1,45 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "BIBO2 dual", - "position": "1" - }, - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": 0.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } - } + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "bibo2_dual", + "position": "1" + }, + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_nozzle_offset_x": { + "default_value": 0.0 + }, + "machine_nozzle_offset_y": { + "default_value": 0.0 + }, + "machine_extruder_start_pos_abs": { + "default_value": true + }, + "machine_extruder_start_pos_x": { + "value": "prime_tower_position_x" + }, + "machine_extruder_start_pos_y": { + "value": "prime_tower_position_y" + }, + "machine_extruder_end_pos_abs": { + "default_value": true + }, + "machine_extruder_end_pos_x": { + "value": "prime_tower_position_x" + }, + "machine_extruder_end_pos_y": { + "value": "prime_tower_position_y" + } + } } diff --git a/resources/extruders/cr-x_extruder_0.def.json b/resources/extruders/cr-x_extruder_0.def.json index 4e73fd0e8e..d9b7b03021 100644 --- a/resources/extruders/cr-x_extruder_0.def.json +++ b/resources/extruders/cr-x_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Left Extruder", "inherits": "fdmextruder", "metadata": { - "machine": "Creality CR-X", + "machine": "creality_cr-x", "position": "0" }, diff --git a/resources/extruders/cr-x_extruder_1.def.json b/resources/extruders/cr-x_extruder_1.def.json index ed6056dab9..8e763df64f 100644 --- a/resources/extruders/cr-x_extruder_1.def.json +++ b/resources/extruders/cr-x_extruder_1.def.json @@ -3,7 +3,7 @@ "name": "Right Extruder", "inherits": "fdmextruder", "metadata": { - "machine": "Creality CR-X", + "machine": "creality_cr-x", "position": "1" }, diff --git a/resources/extruders/creatable_d3_extruder_0.def.json b/resources/extruders/creatable_d3_extruder_0.def.json index 6a805febd5..95883d0f69 100644 --- a/resources/extruders/creatable_d3_extruder_0.def.json +++ b/resources/extruders/creatable_d3_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Creatable_D3", + "machine": "creatable_d3", "position": "0" }, diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json index dc63081bd2..70117c2aed 100644 --- a/resources/extruders/hellbot_magna_i_extruder.def.json +++ b/resources/extruders/hellbot_magna_i_extruder.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "hellbot_magna_i", + "machine": "hellbot_magna_I", "position": "0" }, diff --git a/resources/extruders/key3d_tyro_extruder_0.def.json b/resources/extruders/key3d_tyro_extruder_0.def.json index 11619da332..f08ae351ab 100644 --- a/resources/extruders/key3d_tyro_extruder_0.def.json +++ b/resources/extruders/key3d_tyro_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "0.4mm Nozzle", "inherits": "fdmextruder", "metadata": { - "machine": "Tyro", + "machine": "key3d_tyro", "position": "0" }, From 1f4c863683c7c4eaaa88d3bdcc3e6e55fe5308ea Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Nov 2019 15:08:09 +0100 Subject: [PATCH 844/994] Also assert that the extruder_nr setting matches --- tests/Settings/TestDefinitionContainer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 8bb7a754d3..4487388b86 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -169,4 +169,9 @@ def test_extruderMatch(file_path: str): assert "machine_extruder_trains" in machine_doc["metadata"], "Machine must define extruder trains." extruder_trains = machine_doc["metadata"]["machine_extruder_trains"] assert position in extruder_trains, "There must be a reference to the extruder in the machine definition." - assert extruder_trains[position] == extruder_id, "The extruder referenced in the machine definition must match up." \ No newline at end of file + assert extruder_trains[position] == extruder_id, "The extruder referenced in the machine definition must match up." + + # Also test if the extruder_nr setting is properly overridden. + if "overrides" not in doc or "extruder_nr" not in doc["overrides"] or "default_value" not in doc["overrides"]["extruder_nr"]: + assert position == "0" # Default to 0 is allowed. + assert doc["overrides"]["extruder_nr"]["default_value"] == int(position) \ No newline at end of file From be0e1f7284401b1e85b6ae884bce83784b041304 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 1 Nov 2019 15:14:04 +0100 Subject: [PATCH 845/994] Ensure that all updates from settingInheritance are on a timer --- cura/Settings/SettingInheritanceManager.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 8be0813d0a..7db579bf3f 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -28,20 +28,21 @@ if TYPE_CHECKING: class SettingInheritanceManager(QObject): def __init__(self, parent = None) -> None: super().__init__(parent) - Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerChanged) + self._global_container_stack = None # type: Optional[ContainerStack] self._settings_with_inheritance_warning = [] # type: List[str] self._active_container_stack = None # type: Optional[ExtruderStack] - self._onGlobalContainerChanged() - - ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) - self._onActiveExtruderChanged() self._update_timer = QTimer() self._update_timer.setInterval(500) self._update_timer.setSingleShot(True) self._update_timer.timeout.connect(self._update) + Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerChanged) + ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) + self._onGlobalContainerChanged() + self._onActiveExtruderChanged() + settingsWithIntheritanceChanged = pyqtSignal() ## Get the keys of all children settings with an override. @@ -106,7 +107,7 @@ class SettingInheritanceManager(QObject): if self._active_container_stack is not None: self._active_container_stack.propertyChanged.connect(self._onPropertyChanged) self._active_container_stack.containersChanged.connect(self._onContainersChanged) - self._update() # Ensure that the settings_with_inheritance_warning list is populated. + self._update_timer.start() # Ensure that the settings_with_inheritance_warning list is populated. def _onPropertyChanged(self, key: str, property_name: str) -> None: if (property_name == "value" or property_name == "enabled") and self._global_container_stack: From c2e6116983ba23c215ecdd4a90f0f37b9b617449 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 1 Nov 2019 16:20:42 +0100 Subject: [PATCH 846/994] Add names to all the threads --- cura/PrinterOutput/FirmwareUpdater.py | 4 ++-- plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py | 2 +- plugins/USBPrinting/USBPrinterOutputDevice.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/PrinterOutput/FirmwareUpdater.py b/cura/PrinterOutput/FirmwareUpdater.py index 3f20e0f3c4..56e260a7f0 100644 --- a/cura/PrinterOutput/FirmwareUpdater.py +++ b/cura/PrinterOutput/FirmwareUpdater.py @@ -20,7 +20,7 @@ class FirmwareUpdater(QObject): self._output_device = output_device - self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True) + self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True, name = "FirmwareUpdateThread") self._firmware_file = "" self._firmware_progress = 0 @@ -43,7 +43,7 @@ class FirmwareUpdater(QObject): ## Cleanup after a succesful update def _cleanupAfterUpdate(self) -> None: # Clean up for next attempt. - self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True) + self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True, name = "FirmwareUpdateThread") self._firmware_file = "" self._onFirmwareProgress(100) self._setFirmwareUpdateState(FirmwareUpdateState.completed) diff --git a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py index 0446af177b..421246fb95 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py @@ -43,7 +43,7 @@ class ZeroConfClient: Logger.logException("e", "Failed to create zeroconf instance.") return - self._service_changed_request_thread = Thread(target = self._handleOnServiceChangedRequests, daemon = True) + self._service_changed_request_thread = Thread(target = self._handleOnServiceChangedRequests, daemon = True, name = "ZeroConfServiceChangedThread") self._service_changed_request_thread.start() self._zero_conf_browser = ServiceBrowser(self._zero_conf, self.ZERO_CONF_NAME, [self._queueService]) diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 4930835f58..c9758d88d4 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -61,7 +61,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._all_baud_rates = [115200, 250000, 500000, 230400, 57600, 38400, 19200, 9600] # Instead of using a timer, we really need the update to be as a thread, as reading from serial can block. - self._update_thread = Thread(target = self._update, daemon = True) + self._update_thread = Thread(target = self._update, daemon = True, name = "USBPrinterUpdate") self._last_temperature_request = None # type: Optional[int] self._firmware_idle_count = 0 @@ -212,7 +212,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._serial.close() # Re-create the thread so it can be started again later. - self._update_thread = Thread(target=self._update, daemon=True) + self._update_thread = Thread(target=self._update, daemon=True, name = "USBPrinterUpdate") self._serial = None ## Send a command to printer. From 90bb56d864e509b9ed2bd120c7b4fb06c3194667 Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Fri, 1 Nov 2019 16:39:36 +0100 Subject: [PATCH 847/994] Add files via upload --- ...apfrog_Bolt_Pro_pva_grey_standard.inst.cfg | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg new file mode 100644 index 0000000000..34dca0d94b --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg @@ -0,0 +1,116 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_pva_grey + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = False + + + +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From 4bae97529c6c31e7a45c56709244f589f4ccbaf4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 1 Nov 2019 17:03:20 +0100 Subject: [PATCH 848/994] Should check plugins if build-type is 'essentials' now. part of CURA-6856 --- cura/ApplicationMetadata.py | 4 ++-- cura/CuraApplication.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 25be4b31e9..45a14587ef 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -43,9 +43,9 @@ except ImportError: CuraDebugMode = DEFAULT_CURA_DEBUG_MODE try: - from cura.CuraVersion import CuraIsEnterpriseVersion # type: ignore + from cura.CuraVersion import CuraIsSecuredVersion # type: ignore except ImportError: - CuraIsEnterpriseVersion = True # (DEFAULT_CURA_BUILD_TYPE != "") + CuraIsSecuredVersion = (CuraBuildType.lower() in ["essentials", "enterprise", "assured", "secure", "secured"]) # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5dfe0ad041..ac1cca8217 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -720,7 +720,7 @@ class CuraApplication(QtApplication): ## Handle loading of all plugin types (and the backend explicitly) # \sa PluginRegistry def _loadPlugins(self) -> None: - self._plugin_registry.setCheckIfTrusted(ApplicationMetadata.CuraIsEnterpriseVersion) + self._plugin_registry.setCheckIfTrusted(ApplicationMetadata.CuraIsSecuredVersion) self._plugin_registry.addType("profile_reader", self._addProfileReader) self._plugin_registry.addType("profile_writer", self._addProfileWriter) From 0b6938e9aa5f4de81a05b29d41ab61ae3195417a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 3 Nov 2019 01:14:38 +0100 Subject: [PATCH 849/994] Specify that this setting is about wiping --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 90d6c8e2d8..0662be7488 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7441,7 +7441,7 @@ }, "wipe_retraction_prime_speed": { - "label": "Retraction Prime Speed", + "label": "Wipe Retraction Prime Speed", "description": "The speed at which the filament is primed during a wipe retraction move.", "unit": "mm/s", "type": "float", From e2b8a44e2d01eff6602d7a55f0e80a00018c6315 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 3 Nov 2019 01:18:35 +0100 Subject: [PATCH 850/994] Better defaults for retraction and z hop during wipe Let's use the normal retraction and z hop settings to be safe. Should work fine. --- resources/definitions/fdmprinter.def.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0662be7488..3380758519 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7375,6 +7375,7 @@ "description": "Retract the filament when the nozzle is moving over a non-printed area.", "type": "bool", "default_value": true, + "value": "retraction_enable", "enabled": "clean_between_layers", "settable_per_mesh": false, "settable_per_extruder": true, @@ -7387,6 +7388,7 @@ "unit": "mm", "type": "float", "default_value": 1, + "value": "retraction_amount", "minimum_value_warning": "-0.0001", "maximum_value_warning": "10.0", "enabled": "wipe_retraction_enable and clean_between_layers", @@ -7401,6 +7403,7 @@ "unit": "mm³", "type": "float", "default_value": 0, + "value": "retraction_extra_prime_amount", "minimum_value_warning": "-0.0001", "maximum_value_warning": "10.0", "enabled": "wipe_retraction_enable and clean_between_layers", @@ -7414,6 +7417,7 @@ "unit": "mm/s", "type": "float", "default_value": 5, + "value": "retraction_speed", "minimum_value": "0", "minimum_value_warning": "1", "maximum_value": "machine_max_feedrate_e", @@ -7435,7 +7439,7 @@ "minimum_value_warning": "1", "maximum_value_warning": "70", "enabled": "wipe_retraction_enable and clean_between_layers", - "value": "retraction_speed", + "value": "wipe_retraction_speed", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -7451,7 +7455,7 @@ "minimum_value_warning": "1", "maximum_value_warning": "70", "enabled": "wipe_retraction_enable and clean_between_layers", - "value": "retraction_speed", + "value": "wipe_retraction_speed", "settable_per_mesh": false, "settable_per_extruder": true } @@ -7476,6 +7480,7 @@ "description": "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.", "type": "bool", "default_value": true, + "value": "retraction_hop_enabled", "enabled": "clean_between_layers", "settable_per_mesh": false, "settable_per_extruder": true, @@ -7488,6 +7493,7 @@ "unit": "mm", "type": "float", "default_value": 1, + "value": "retraction_hop", "enabled": "wipe_hop_enable and clean_between_layers", "settable_per_mesh": false, "settable_per_extruder": true, @@ -7499,7 +7505,8 @@ "description": "Speed to move the z-axis during the hop.", "unit": "mm/s", "type": "float", - "default_value": 100, + "default_value": 10, + "value": "speed_z_hop", "minimum_value": "0", "minimum_value_warning": "1", "enabled": "wipe_hop_enable and clean_between_layers", From 0c846d76a1806009b16fca9b09489e509d9b3976 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 3 Nov 2019 01:41:51 +0100 Subject: [PATCH 851/994] Correct setting name and description of wipe Z hop This hop is executed regardless of whether or not the wipe is retracted. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3380758519..2861e2ec74 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7476,8 +7476,8 @@ }, "wipe_hop_enable": { - "label": "Wipe Z Hop When Retracted", - "description": "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.", + "label": "Wipe Z Hop", + "description": "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.", "type": "bool", "default_value": true, "value": "retraction_hop_enabled", From d25ca84c6c4e7f2ad89fb3557359175530dc5cfa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 3 Nov 2019 02:20:18 +0100 Subject: [PATCH 852/994] Make small feature max length a child setting of small hole max size The small hole max size is not used in CuraEngine. It may not be a leaf setting then. Instead, Small Feature Max Length is used which is directly dependent on Small Hole Max Size. They are simply different units of the same thing. This is how we should structure these settings then. --- resources/definitions/fdmprinter.def.json | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2861e2ec74..2df14c4948 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7559,18 +7559,21 @@ "type": "float", "minimum_value": "0", "default_value": 0, - "settable_per_mesh": true - }, - "small_feature_max_length": - { - "label": "Small Feature Max Length", - "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.", - "unit": "mm", - "type": "float", - "minimum_value": "0", - "default_value": 0, - "value": "small_hole_max_size * math.pi", - "settable_per_mesh": true + "settable_per_mesh": true, + "children": + { + "small_feature_max_length": + { + "label": "Small Feature Max Length", + "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "default_value": 0, + "value": "small_hole_max_size * math.pi", + "settable_per_mesh": true + } + } }, "small_feature_speed_factor": { From ee413359198eb72fc85d763ed04ecc017624b660 Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 10:38:37 +0100 Subject: [PATCH 853/994] Delete leapfrog_bolt_pro.def.json --- .../definitions/leapfrog_bolt_pro.def.json | 131 ------------------ 1 file changed, 131 deletions(-) delete mode 100644 resources/definitions/leapfrog_bolt_pro.def.json diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json deleted file mode 100644 index 4265993222..0000000000 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ /dev/null @@ -1,131 +0,0 @@ - { - "version": 2, - "name": "Leapfrog Bolt Pro", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Karan and Vincent 20191022", - "manufacturer": "Leapfrog B.V.", - "category": "Other", - "platform": "leapfrog_bolt_pro_platform.stl", - "platform_offset": [0, 0, -14], - "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "supports_network_connection": false, - "has_materials": true, - "preferred_material": "leapfrog", - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Brass 0.4", - "preferred_material": "leapfrog_epla_natural", - "variants_name": "Hot end", - "exclude_materials": [ - "generic_pla", - "generic_pla_175", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pva", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - - "machine_extruder_trains": - { - "0": "leapfrog_bolt_pro_extruder_right", - "1": "leapfrog_bolt_pro_extruder_left" - } - }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Bolt Pro" }, - "machine_extruder_count": {"default_value": 2}, - "machine_center_is_zero": {"default_value": false}, - "machine_width": {"default_value": 302}, - "machine_height": {"default_value": 205}, - "machine_depth": {"default_value": 322}, - "machine_heated_bed": {"default_value": true}, - "machine_head_with_fans_polygon": {"default_value": [[-1, 1 ], [1, 1], [1, -1 ], [-1, -1]]}, - "machine_max_feedrate_z": {"default_value": 16.7 }, - "machine_max_feedrate_e": {"default_value": 50 }, - "machine_max_acceleration_z": {"default_value": 100 }, - "machine_acceleration": {"default_value": 400 }, - "machine_max_jerk_xy": {"default_value": 20 }, - "machine_max_jerk_z": {"default_value": 0.4 }, - "machine_max_jerk_e": {"default_value": 5 }, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "material_final_print_temperature": {"value": "default_material_print_temperature" }, - "material_initial_print_temperature": {"value": "default_material_print_temperature" }, - "gantry_height": {"value": "60"}, - "retraction_combing": { "default_value": "all" }, - "retraction_amount": {"default_value": 2}, - "adhesion_type": {"default_value": "skirt"}, - "skirt_line_count": {"default_value": 3}, - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, - "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, - "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, - "prime_tower_circular": {"default_value": false}, - "prime_tower_position_x": {"value": "169"}, - "prime_tower_position_y": {"value": "25"}, - "speed_travel": { "value": "200"}, - "build_volume_temperature": {"enabled": false}, - "material_standby_temperature": {"enabled": false } - } -} \ No newline at end of file From dbdd73790b03287ece6cf2370acf4411dff8cd4b Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 10:39:15 +0100 Subject: [PATCH 854/994] Add files via upload --- .../definitions/leapfrog_bolt_pro.def.json | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 resources/definitions/leapfrog_bolt_pro.def.json diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json new file mode 100644 index 0000000000..06cf956a2f --- /dev/null +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -0,0 +1,118 @@ + { + "version": 2, + "name": "Leapfrog Bolt Pro", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Karan and Vincent 20191104", + "manufacturer": "Leapfrog B.V.", + "category": "Other", + "platform": "leapfrog_bolt_pro_platform.stl", + "platform_offset": [0, 0, -14], + "file_formats": "text/x-gcode", + "supports_usb_connection": false, + "supports_network_connection": false, + "has_materials": true, + "preferred_material": "leapfrog", + "has_machine_quality": true, + "has_variants": true, + "preferred_variant_name": "Brass 0.4", + "preferred_material": "leapfrog_epla_natural", + "variants_name": "Hot end", + "exclude_materials": [ + "generic_pla_175", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pva", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + + "machine_extruder_trains": + { + "0": "leapfrog_bolt_pro_extruder_right", + "1": "leapfrog_bolt_pro_extruder_left" + } + }, + "overrides": { + "machine_name": {"default_value": "Leapfrog Bolt Pro" }, + "machine_extruder_count": {"default_value": 2}, + "machine_center_is_zero": {"default_value": false}, + "machine_width": {"default_value": 302}, + "machine_height": {"default_value": 205}, + "machine_depth": {"default_value": 322}, + "machine_heated_bed": {"default_value": true}, + "machine_head_with_fans_polygon": {"default_value": [[-1, 1 ], [1, 1], [1, -1 ], [-1, -1]]}, + "machine_max_feedrate_z": {"default_value": 16.7 }, + "machine_max_feedrate_e": {"default_value": 50 }, + "machine_max_acceleration_z": {"default_value": 100 }, + "machine_acceleration": {"default_value": 400 }, + "machine_max_jerk_xy": {"default_value": 20 }, + "machine_max_jerk_z": {"default_value": 0.4 }, + "machine_max_jerk_e": {"default_value": 5 }, + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "material_final_print_temperature": {"value": "default_material_print_temperature" }, + "material_initial_print_temperature": {"value": "default_material_print_temperature" }, + "gantry_height": {"value": "60"}, + "retraction_combing": { "default_value": "all" }, + "retraction_amount": {"default_value": 2}, + "adhesion_type": {"default_value": "skirt"}, + "skirt_line_count": {"default_value": 3}, + "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, + "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, + "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, + "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, + "prime_tower_circular": {"default_value": false}, + "prime_tower_position_x": {"value": "169"}, + "prime_tower_position_y": {"value": "25"}, + "speed_travel": { "value": "200"}, + "build_volume_temperature": {"enabled": false}, + "material_standby_temperature": {"enabled": false } + } +} \ No newline at end of file From 336875789788f6265b2e803f7064ff570fa67bb4 Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 10:40:53 +0100 Subject: [PATCH 855/994] Delete Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg --- ...apfrog_Bolt_Pro_pva_grey_standard.inst.cfg | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg deleted file mode 100644 index 34dca0d94b..0000000000 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg +++ /dev/null @@ -1,116 +0,0 @@ -[general] -version = 4 -name = Standard -definition = leapfrog_bolt_pro - -[metadata] -setting_version = 9 -type = quality -quality_type = standard -weight = 1 -material = leapfrog_pva_grey - -[values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere -filter_out_tiny_gaps = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - - - - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - - - -speed_print = 50 -speed_wall = 20 -speed_wall_0 = 20 -speed_wall_x = 20 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = False - - - -retraction_hop_after_extruder_switch_height = 2 - - -cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 4 -cool_min_layer_time = 5 -cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - - - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - - -prime_tower_enable = True -prime_tower_size = 20 -prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 -prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file From bc9f91a8a6db5e5defc7bce6b6701e25eda0b4dd Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 10:41:12 +0100 Subject: [PATCH 856/994] Add files via upload --- ...rog_Bolt_Pro_pva_natural_standard.inst.cfg | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg new file mode 100644 index 0000000000..08dd3579e2 --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg @@ -0,0 +1,116 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = 1 +material = leapfrog_pva_natural + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + + + + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + + + +speed_print = 50 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = False + + + +retraction_hop_after_extruder_switch_height = 2 + + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + + + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True \ No newline at end of file From 41d1ef5f932144511fd6517fc6126b80c45c3261 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 10:44:10 +0100 Subject: [PATCH 857/994] Switch to prepare stage when starting a new project Fixes #6596 --- resources/qml/MainWindow/ApplicationMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 7f343eb8f4..70d7cd422c 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -129,6 +129,7 @@ Item { CuraApplication.deleteAll(); Cura.Actions.resetProfile.trigger(); + UM.Controller.setActiveStage("PrepareStage") } } From 141bd0f127bb31f3254164cd9ae5a4614be61678 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 11:10:30 +0100 Subject: [PATCH 858/994] Remove spammy New Cloud Printer detected message ST-3153 --- .../src/Cloud/CloudOutputDeviceManager.py | 11 +---- .../Messages/CloudPrinterDetectedMessage.py | 45 ------------------- 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index c4929fc2d1..ccc64f8073 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -15,7 +15,6 @@ from cura.Settings.GlobalStack import GlobalStack from .CloudApiClient import CloudApiClient from .CloudOutputDevice import CloudOutputDevice from ..Models.Http.CloudClusterResponse import CloudClusterResponse -from ..Messages.CloudPrinterDetectedMessage import CloudPrinterDetectedMessage ## The cloud output device manager is responsible for using the Ultimaker Cloud APIs to manage remote clusters. @@ -111,7 +110,6 @@ class CloudOutputDeviceManager: ) self._remote_clusters[device.getId()] = device self.discoveredDevicesChanged.emit() - self._checkIfNewClusterWasAdded(device.clusterData.cluster_id) self._connectToActiveMachine() def _onDiscoveredDeviceUpdated(self, cluster_data: CloudClusterResponse) -> None: @@ -183,11 +181,4 @@ class CloudOutputDeviceManager: output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() if device.key not in output_device_manager.getOutputDeviceIds(): - output_device_manager.addOutputDevice(device) - - ## Checks if Cura has a machine stack (printer) for the given cluster ID and shows a message if it hasn't. - def _checkIfNewClusterWasAdded(self, cluster_id: str) -> None: - container_registry = CuraApplication.getInstance().getContainerRegistry() - cloud_machines = container_registry.findContainersMetadata(**{self.META_CLUSTER_ID: "*"}) # all cloud machines - if not any(machine[self.META_CLUSTER_ID] == cluster_id for machine in cloud_machines): - CloudPrinterDetectedMessage().show() + output_device_manager.addOutputDevice(device) \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py b/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py deleted file mode 100644 index 3a1a9f0e0f..0000000000 --- a/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -from UM import i18nCatalog -from UM.Message import Message -from cura.CuraApplication import CuraApplication - -I18N_CATALOG = i18nCatalog("cura") - - -## Message shown when a new printer was added to your account but not yet in Cura. -class CloudPrinterDetectedMessage(Message): - - # Singleton used to prevent duplicate messages of this type at the same time. - __is_visible = False - - # Store in preferences to hide this message in the future. - _preference_key = "cloud/block_new_printers_popup" - - def __init__(self) -> None: - super().__init__( - title=I18N_CATALOG.i18nc("@info:title", "New cloud printers found"), - text=I18N_CATALOG.i18nc("@info:message", "New printers have been found connected to your account, " - "you can find them in your list of discovered printers."), - lifetime=0, - dismissable=True, - option_state=False, - option_text=I18N_CATALOG.i18nc("@info:option_text", "Do not show this message again") - ) - self.optionToggled.connect(self._onDontAskMeAgain) - CuraApplication.getInstance().getPreferences().addPreference(self._preference_key, False) - - def show(self) -> None: - if CuraApplication.getInstance().getPreferences().getValue(self._preference_key): - return - if CloudPrinterDetectedMessage.__is_visible: - return - super().show() - CloudPrinterDetectedMessage.__is_visible = True - - def hide(self, send_signal = True) -> None: - super().hide(send_signal) - CloudPrinterDetectedMessage.__is_visible = False - - def _onDontAskMeAgain(self, checked: bool) -> None: - CuraApplication.getInstance().getPreferences().setValue(self._preference_key, checked) From 248f4fc21c791e92a013dbc96a8f7c1adab9f324 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 1 Nov 2019 13:54:52 +0100 Subject: [PATCH 859/994] Draw the NoIntentIcon over the intent description hover area. This fixes a bug where the NoIntent tooltip was hidden by the intent description CURA-6936 (cherry picked from commit 315b93a1525ba53f520f12b09669668266f12c6c) --- .../RecommendedQualityProfileSelector.qml | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 3c7caad470..5e58faec78 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -124,18 +124,6 @@ Item elide: Text.ElideRight } - NoIntentIcon - { - affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent - intent_type: model.name - anchors.right: intentCategoryLabel.right - anchors.rightMargin: UM.Theme.getSize("narrow_margin").width - width: intentCategoryLabel.height * 0.75 - anchors.verticalCenter: parent.verticalCenter - height: width - visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length - } - Cura.RadioCheckbar { anchors @@ -164,8 +152,9 @@ Item isCheckedFunction: checkedFunction } - MouseArea // tooltip hover area + MouseArea // Intent description tooltip hover area { + id: intentDescriptionHoverArea anchors.fill: parent hoverEnabled: true enabled: model.description !== undefined @@ -181,6 +170,20 @@ Item } onExited: base.hideTooltip() } + + NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it. + { + affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent + intent_type: model.name + anchors.right: intentCategoryLabel.right + anchors.rightMargin: UM.Theme.getSize("narrow_margin").width + width: intentCategoryLabel.height * 0.75 + anchors.verticalCenter: parent.verticalCenter + height: width + visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length + } + + } } From aa5b788b5923b8b3d884d75d88022f28dbb78ba3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 11:30:48 +0100 Subject: [PATCH 860/994] Fix issue with profiles getting added to non creality printers in upgrade --- .../VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py index a5a77a91e0..b70d5190eb 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -325,6 +325,8 @@ class VersionUpgrade41to42(VersionUpgrade): material_id = parser["containers"]["3"] old_quality_id = parser["containers"]["2"] if material_id in _creality_quality_per_material and old_quality_id in _creality_quality_per_material[material_id]: + if definition_id == "creality_cr10_extruder_0": # We can't disambiguate between Creality CR-10 and Creality-CR10S since they share the same extruder definition. Have to go by the name. + if "cr-10s" in parser["metadata"].get("machine", "Creality CR-10").lower(): # Not perfect, since the user can change this name :( parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id] stack_copy = {} # type: Dict[str, str] # Make a copy so that we don't modify the dict we're iterating over. From c7c6389897eec1efa70185afec5096ff6b38879c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 4 Nov 2019 11:46:11 +0100 Subject: [PATCH 861/994] Report on all faulty keys at once instead of crashing on first This makes it a lot easier to communicate back to users what is going wrong. --- tests/Settings/TestDefinitionContainer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 4487388b86..9e8e967692 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -70,9 +70,12 @@ def test_validateOverridingDefaultValue(file_path: str): if "overrides" not in doc: return # No settings are being overridden. No need to check anything. parent_settings = getInheritedSettings(doc["inherits"]) + faulty_keys = set() for key, val in doc["overrides"].items(): if key in parent_settings and "value" in parent_settings[key]: - assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_path) # If there is a value in the parent settings, then the default_value is not effective. + if "default_value" in val: + faulty_keys.add(key) + assert not faulty_keys, "Unnecessary default_values for {faulty_keys} in {file_name}".format(faulty_keys = sorted(faulty_keys), file_name = file_path) # If there is a value in the parent settings, then the default_value is not effective. ## Get all settings and their properties from a definition we're inheriting # from. From 8389c2c17a5b77ec2535f4f7071cb506d1161c15 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 4 Nov 2019 11:51:10 +0100 Subject: [PATCH 862/994] Add the (probably) final intent profile descriptions (English) CURA-6890 --- cura/Machines/Models/IntentCategoryModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index a968d12b7a..b149852462 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -37,15 +37,15 @@ class IntentCategoryModel(ListModel): } _translations["visual"] = { "name": catalog.i18nc("@label", "Visual"), - "description": catalog.i18nc("@text", "Optimized for appearance") + "description": catalog.i18nc("@text", "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality.") } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "Optimized for higher accuracy") + "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of improved accuracy and for tighter tolerances.") } _translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), - "description": catalog.i18nc("@text", "Optimized for fast results") + "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } From e13108f267fc0aef40d6674859b74767d4e4f279 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 4 Nov 2019 11:52:11 +0100 Subject: [PATCH 863/994] Don't request updates if update checking is disabled I remember remarking this at one point but then it was said that we'd only need to implement the 'Minimum Viable Product' for the Toolbox. Well this is what happens then... --- plugins/Toolbox/src/Toolbox.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 08b6c80b1d..869ac6ab5e 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -191,8 +191,9 @@ class Toolbox(QObject, Extension): "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)) } - # Request the latest and greatest! - self._fetchPackageData() + if CuraApplication.getInstance().getPreferences().getValue("info/automatic_update_check"): + # Request the latest and greatest! + self._fetchPackageData() def _fetchPackageData(self): # Create the network manager: From b54c24e9a1de84e92005c641499e3bc5ac6975b8 Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Mon, 4 Nov 2019 12:34:08 +0100 Subject: [PATCH 864/994] Changed selected parameters "default_value" to "value" --- resources/definitions/skriware_2.def.json | 272 +++++++++++----------- 1 file changed, 135 insertions(+), 137 deletions(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 8873b8a5ef..e3722cdacb 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -2,77 +2,78 @@ "name": "Skriware 2", "version": 2, "inherits": "fdmprinter", - "metadata": - { + "metadata": { "visible": true, "author": "Skriware", "manufacturer": "Skriware", "category": "Other", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], + "platform_offset": [ + 0, + 0, + 0 + ], "supports_usb_connection": false, "platform": "skriware_2_platform.stl", - "machine_extruder_trains": - { + "machine_extruder_trains": { "0": "skriware_2_extruder_0", "1": "skriware_2_extruder_1" } }, - "overrides": { "jerk_print_layer_0": { - "default_value": 5 + "value": 5 }, "jerk_prime_tower": { - "default_value": 5 + "value": 5 }, "expand_skins_expand_distance": { - "default_value": 1.2 + "value": 1.2 }, "jerk_support_interface": { - "default_value": 5 + "value": 5 }, "jerk_travel_layer_0": { - "default_value": 5.0 + "value": 5.0 }, "wipe_retraction_prime_speed": { - "default_value": 30 + "value": 30 }, "material_standby_temperature": { "default_value": 195 }, "acceleration_support_bottom": { - "default_value": 250 + "value": 250 }, "raft_base_line_width": { - "default_value": 0.5 + "value": 0.5 }, "raft_speed": { - "default_value": 30.0 + "value": 30.0 }, "jerk_topbottom": { - "default_value": 5 + "value": 5 }, "ironing_inset": { - "default_value": 0.2 + "value": 0.2 }, "acceleration_wall": { - "default_value": 250 + "value": 250 }, "cross_infill_pocket_size": { - "default_value": 5.333333333333333 + "value": 5.333333333333333 }, "jerk_support_roof": { - "default_value": 5 + "value": 5 }, "acceleration_print": { "default_value": 250 }, "meshfix_maximum_travel_resolution": { - "default_value": 0.8 + "value": 0.8 }, "support_top_distance": { - "default_value": 0.22 + "value": 0.22 }, "acceleration_enabled": { "default_value": true @@ -81,28 +82,28 @@ "default_value": true }, "jerk_layer_0": { - "default_value": 5 + "value": 5 }, "infill_line_distance": { - "default_value": 5.333333333333333 + "value": 5.333333333333333 }, "acceleration_ironing": { "default_value": 250 }, "material_print_temperature_layer_0": { - "default_value": 195 + "value": 195 }, "machine_extruder_start_pos_x": { "default_value": 0 }, "bridge_skin_speed_2": { - "default_value": 15 + "value": 15 }, "acceleration_travel": { - "default_value": 250 + "value": 250 }, "switch_extruder_retraction_speed": { - "default_value": 30 + "value": 30 }, "machine_extruder_cooling_fan_number": { "default_value": 0 @@ -110,77 +111,74 @@ "jerk_print": { "default_value": 5 }, - "material_guid": { - "default_value": "0ff92885-617b-4144-a03c-9989872454bc" - }, "raft_interface_acceleration": { - "default_value": 250 + "value": 250 }, "acceleration_support_interface": { - "default_value": 250 + "value": 250 }, "cool_fan_full_layer": { - "default_value": 1 + "value": 1 }, "skirt_brim_minimal_length": { "default_value": 50 }, "material_bed_temperature": { - "default_value": 50 + "value": 50 }, "speed_slowdown_layers": { "default_value": 1 }, "speed_travel": { - "default_value": 150 + "value": 150 }, "skin_overlap": { - "default_value": 15 + "value": 15 }, "acceleration_infill": { - "default_value": 250 + "value": 250 }, "support_roof_material_flow": { - "default_value": 99 + "value": 99 }, "raft_base_jerk": { - "default_value": 5 + "value": 5 }, "retraction_retract_speed": { - "default_value": 30 + "value": 30 }, "infill_wipe_dist": { - "default_value": 0.1 + "value": 0.1 }, "jerk_wall_x": { - "default_value": 5 + "value": 5 }, "layer_height": { "default_value": 0.2 }, "bottom_skin_expand_distance": { - "default_value": 1.2000000000000002 + "value": 1.2000000000000002 }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 0}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" }, "travel_retract_before_outer_wall": { "default_value": true }, "xy_offset_layer_0": { - "default_value": -0.16 + "value": -0.16 }, "adhesion_type": { "default_value": "raft" }, "min_skin_width_for_expansion": { - "default_value": 0.671279704941824 + "value": 0.671279704941824 }, "support_bottom_material_flow": { - "default_value": 99 + "value": 99 }, "prime_tower_position_x": { - "default_value": 1 + "value": 1 }, "machine_depth": { "default_value": 260 @@ -198,22 +196,22 @@ "default_value": false }, "z_seam_x": { - "default_value": 115 + "value": 115 }, "support_xy_distance_overhang": { - "default_value": 0.5 + "value": 0.5 }, "support_tree_wall_thickness": { - "default_value": 0.4 + "value": 0.4 }, "acceleration_print_layer_0": { - "default_value": 250 + "value": 250 }, "support_xy_distance": { "default_value": 0.8 }, "support_roof_line_distance": { - "default_value": 0.5714285714285714 + "value": 0.5714285714285714 }, "jerk_enabled": { "default_value": true @@ -225,7 +223,7 @@ "default_value": true }, "bottom_layers": { - "default_value": 3 + "value": 3 }, "multiple_mesh_overlap": { "default_value": 0 @@ -234,28 +232,28 @@ "default_value": true }, "acceleration_topbottom": { - "default_value": 250 + "value": 250 }, "jerk_wall": { - "default_value": 5 + "value": 5 }, "jerk_wall_0": { - "default_value": 5 + "value": 5 }, "skin_overlap_mm": { - "default_value": 0.06 + "value": 0.06 }, "retraction_min_travel": { - "default_value": 1 + "value": 1 }, "support_interface_material_flow": { - "default_value": 99 + "value": 99 }, "material_diameter": { "default_value": 1.75 }, "speed_roofing": { - "default_value": 30.0 + "value": 30.0 }, "skin_outline_count": { "default_value": 0 @@ -264,13 +262,13 @@ "default_value": true }, "top_bottom_pattern_0": { - "default_value": "zigzag" + "value": "zigzag" }, "top_skin_expand_distance": { - "default_value": 1.2000000000000002 + "value": 1.2000000000000002 }, "acceleration_travel_layer_0": { - "default_value": 250.0 + "value": 250.0 }, "prime_tower_min_volume": { "default_value": 4 @@ -279,28 +277,28 @@ "default_value": 30 }, "skin_preshrink": { - "default_value": 1.2000000000000002 + "value": 1.2000000000000002 }, "material_bed_temperature_layer_0": { - "default_value": 50 + "value": 50 }, "support_tree_collision_resolution": { - "default_value": 0.2 + "value": 0.2 }, "machine_height": { "default_value": 210 }, "raft_acceleration": { - "default_value": 250 + "value": 250 }, "fill_outline_gaps": { "default_value": true }, "wall_x_material_flow": { - "default_value": 99 + "value": 99 }, "jerk_support_bottom": { - "default_value": 5 + "value": 5 }, "machine_end_gcode": { "default_value": "M59\nG92 E1\nG1 E-1 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" @@ -312,19 +310,19 @@ "default_value": 0.005 }, "wall_0_material_flow": { - "default_value": 99 + "value": 99 }, "material_adhesion_tendency": { "default_value": 0 }, "prime_tower_flow": { - "default_value": 99 + "value": 99 }, "prime_tower_position_y": { - "default_value": 1 + "value": 1 }, "support_material_flow": { - "default_value": 99 + "value": 99 }, "machine_extruder_start_code": { "default_value": "" @@ -339,79 +337,79 @@ "default_value": 1.2 }, "support_infill_sparse_thickness": { - "default_value": 0.2 + "value": 0.2 }, "raft_surface_acceleration": { - "default_value": 250 + "value": 250 }, "machine_nozzle_offset_y": { "default_value": 0 }, "roofing_layer_count": { - "default_value": 1 + "value": 1 }, "skirt_brim_line_width": { - "default_value": 0.5 + "value": 0.5 }, "jerk_support": { - "default_value": 5 + "value": 5 }, "raft_surface_jerk": { - "default_value": 5 + "value": 5 }, "speed_equalize_flow_max": { "default_value": 40 }, "raft_surface_speed": { - "default_value": 30.0 + "value": 30.0 }, "jerk_travel": { - "default_value": 5 + "value": 5 }, "support_zag_skip_count": { - "default_value": 8 + "value": 8 }, "retraction_combing": { "default_value": "infill" }, "raft_interface_line_spacing": { - "default_value": 0.4 + "value": 0.4 }, "layer_height_0": { "default_value": 0.2 }, "extruders_enabled_count": { - "default_value": 2 + "value": 2 }, "support_line_distance": { - "default_value": 1.3333333333333333 + "value": 1.3333333333333333 }, "support_roof_density": { - "default_value": 70 + "value": 70 }, "raft_base_line_spacing": { - "default_value": 0.8 + "value": 0.8 }, "machine_extruder_end_pos_y": { "default_value": 0 }, "acceleration_prime_tower": { - "default_value": 250 + "value": 250 }, "skin_material_flow": { - "default_value": 99 + "value": 99 }, "support_z_distance": { "default_value": 0.22 }, "bottom_skin_preshrink": { - "default_value": 1.2000000000000002 + "value": 1.2000000000000002 }, "jerk_skirt_brim": { - "default_value": 5 + "value": 5 }, "z_seam_y": { - "default_value": 180 + "value": 180 }, "skirt_line_count": { "default_value": 2 @@ -420,76 +418,76 @@ "default_value": 4 }, "infill_material_flow": { - "default_value": 99 + "value": 99 }, "wipe_retraction_retract_speed": { - "default_value": 30 + "value": 30 }, "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, "support_roof_height": { - "default_value": 0.4 + "value": 0.4 }, "top_layers": { - "default_value": 4 + "value": 4 }, "support_infill_rate": { - "default_value": 30 + "value": 30 }, "raft_interface_speed": { - "default_value": 35 + "value": 35 }, "default_material_print_temperature": { "default_value": 195 }, "acceleration_layer_0": { - "default_value": 250 + "value": 250 }, "support_skip_zag_per_mm": { "default_value": 10 }, "material_initial_print_temperature": { - "default_value": 195 + "value": 195 }, "raft_interface_jerk": { - "default_value": 5 + "value": 5 }, "machine_width": { "default_value": 210 }, "wall_line_count": { - "default_value": 3 + "value": 3 }, "retraction_amount": { "default_value": 3 }, "infill_sparse_thickness": { - "default_value": 0.2 + "value": 0.2 }, "support_initial_layer_line_distance": { - "default_value": 1.3333333333333333 + "value": 1.3333333333333333 }, "jerk_support_infill": { - "default_value": 5 + "value": 5 }, "acceleration_roofing": { - "default_value": 250 + "value": 250 }, "retraction_extrusion_window": { - "default_value": 3 + "value": 3 }, "raft_interface_line_width": { - "default_value": 0.4 + "value": 0.4 }, "acceleration_support_roof": { - "default_value": 250 + "value": 250 }, "support_brim_line_count": { - "default_value": 16 + "value": 16 }, "layer_0_z_overlap": { - "default_value": 0.1 + "value": 0.1 }, "support_angle": { "default_value": 60 @@ -498,13 +496,13 @@ "default_value": true }, "raft_surface_thickness": { - "default_value": 0.2 + "value": 0.2 }, "cool_min_layer_time": { "default_value": 10 }, "gantry_height": { - "default_value": 210 + "value": 210 }, "raft_airgap": { "default_value": 0.2 @@ -513,16 +511,16 @@ "default_value": 0 }, "acceleration_skirt_brim": { - "default_value": 250 + "value": 250 }, "skirt_brim_material_flow": { - "default_value": 99 + "value": 99 }, "jerk_infill": { - "default_value": 5 + "value": 5 }, "roofing_material_flow": { - "default_value": 99 + "value": 99 }, "extruder_nr": { "default_value": 0 @@ -540,10 +538,10 @@ "default_value": "" }, "speed_travel_layer_0": { - "default_value": 75.0 + "value": 75.0 }, "raft_base_acceleration": { - "default_value": 250 + "value": 250 }, "retraction_count_max": { "default_value": 40 @@ -552,7 +550,7 @@ "default_value": 4 }, "acceleration_support": { - "default_value": 250 + "value": 250 }, "max_skin_angle_for_expansion": { "default_value": 50 @@ -564,19 +562,19 @@ "default_value": 10 }, "acceleration_support_infill": { - "default_value": 250 + "value": 250 }, "machine_extruder_start_pos_abs": { "default_value": false }, "retraction_prime_speed": { - "default_value": 30 + "value": 30 }, "raft_base_speed": { - "default_value": 35 + "value": 35 }, "acceleration_wall_0": { - "default_value": 250 + "value": 250 }, "xy_offset": { "default_value": -0.16 @@ -588,34 +586,34 @@ "default_value": 1 }, "jerk_ironing": { - "default_value": 5 + "value": 5 }, "switch_extruder_prime_speed": { - "default_value": 30 + "value": 30 }, "raft_jerk": { - "default_value": 5 + "value": 5 }, "top_skin_preshrink": { - "default_value": 1.2000000000000002 + "value": 1.2000000000000002 }, "material_print_temperature": { - "default_value": 195 + "value": 195 }, "wall_material_flow": { - "default_value": 99 + "value": 99 }, "jerk_roofing": { - "default_value": 5 + "value": 5 }, "cool_fan_full_at_height": { - "default_value": 0 + "value": 0 }, "acceleration_wall_x": { - "default_value": 250 + "value": 250 }, "support_bottom_distance": { - "default_value": 0.23 + "value": 0.23 }, "cool_min_speed": { "default_value": 15 @@ -624,7 +622,7 @@ "default_value": 50 }, "raft_interface_thickness": { - "default_value": 0.2 + "value": 0.2 }, "machine_extruder_end_pos_abs": { "default_value": false From b1316b8a053906949a444ca8c7c685324ef711fa Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 4 Nov 2019 12:56:41 +0100 Subject: [PATCH 865/994] Fix installed_packages query params --- plugins/Toolbox/src/Toolbox.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index c63d36d8c4..be62873a2f 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -189,9 +189,11 @@ class Toolbox(QObject, Extension): sdk_version = self._sdk_version ) + # We need to construct a query like installed_packages=ID:VERSION&installed_packages=ID:VERSION, etc. installed_package_ids_with_versions = [":".join(items) for items in self._package_manager.getAllInstalledPackageIdsAndVersions()] - installed_packages_query = ",".join(installed_package_ids_with_versions) + installed_packages_query = "&installed_packages=".join(installed_package_ids_with_versions) + self._request_urls = { "authors": QUrl("{base_url}/authors".format(base_url = self._api_url)), "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)), From ad85e29c0aad4fbb3e8b47591d1d8cdc518c7869 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 13:11:46 +0100 Subject: [PATCH 866/994] Fix stupid identation issue --- .../VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py index b70d5190eb..1151d7101a 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -327,7 +327,7 @@ class VersionUpgrade41to42(VersionUpgrade): if material_id in _creality_quality_per_material and old_quality_id in _creality_quality_per_material[material_id]: if definition_id == "creality_cr10_extruder_0": # We can't disambiguate between Creality CR-10 and Creality-CR10S since they share the same extruder definition. Have to go by the name. if "cr-10s" in parser["metadata"].get("machine", "Creality CR-10").lower(): # Not perfect, since the user can change this name :( - parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id] + parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id] stack_copy = {} # type: Dict[str, str] # Make a copy so that we don't modify the dict we're iterating over. stack_copy.update(parser["containers"]) From 3d352b3585cd3730912836d4105169b9221e3813 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 4 Nov 2019 15:44:04 +0100 Subject: [PATCH 867/994] Show welcome page in marketplace window when not logged in TODO: marketplace logo CURA-6569 --- plugins/Toolbox/resources/qml/Toolbox.qml | 9 ++++ plugins/Toolbox/resources/qml/WelcomePage.qml | 53 +++++++++++++++++++ plugins/Toolbox/src/Toolbox.py | 23 ++++++-- resources/qml/MainWindow/ApplicationMenu.qml | 2 +- 4 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 plugins/Toolbox/resources/qml/WelcomePage.qml diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index f70dab03d8..cf69231428 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -1,6 +1,8 @@ // Copyright (c) 2018 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. +// Main window for the Toolbox + import QtQuick 2.2 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.2 @@ -29,9 +31,16 @@ Window Item { anchors.fill: parent + + WelcomePage + { + visible: toolbox.viewPage === "welcome" + } + ToolboxHeader { id: header + visible: toolbox.viewPage !== "welcome" } Item diff --git a/plugins/Toolbox/resources/qml/WelcomePage.qml b/plugins/Toolbox/resources/qml/WelcomePage.qml new file mode 100644 index 0000000000..a89b490b51 --- /dev/null +++ b/plugins/Toolbox/resources/qml/WelcomePage.qml @@ -0,0 +1,53 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.1 +import QtQuick.Window 2.2 + +import UM 1.3 as UM +import Cura 1.1 as Cura + +Column +{ + id: welcomePage + spacing: UM.Theme.getSize("wide_margin").height + width: parent.width + height: childrenRect.height + anchors.centerIn: parent + + Image + { + id: profileImage + fillMode: Image.PreserveAspectFit + source: "../images/logobot.svg" + anchors.horizontalCenter: parent.horizontalCenter + width: Math.round(parent.width / 4) + } + + Label + { + id: welcomeTextLabel + text: catalog.i18nc("@description", "Get plugins and materials verified by Ultimaker") + width: Math.round(parent.width / 2) + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + wrapMode: Label.WordWrap + renderType: Text.NativeRendering + } + + Cura.PrimaryButton + { + id: loginButton + width: UM.Theme.getSize("account_button").width + height: UM.Theme.getSize("account_button").height + anchors.horizontalCenter: parent.horizontalCenter + text: catalog.i18nc("@button", "Sign in") + onClicked: Cura.API.account.login() + fixedWidthMode: true + } +} + diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 869ac6ab5e..9f8273d6e8 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -86,7 +86,7 @@ class Toolbox(QObject, Extension): # View page defines which type of page layout to use. For example, # possible values include "overview", "detail" or "author". - self._view_page = "loading" # type: str + self._view_page = "welcome" # type: str # Active package refers to which package is currently being downloaded, # installed, or otherwise modified. @@ -105,7 +105,6 @@ class Toolbox(QObject, Extension): self._restart_dialog_message = "" # type: str self._application.initializationFinished.connect(self._onAppInitialized) - self._application.getCuraAPI().account.loginStateChanged.connect(self._updateRequestHeader) self._application.getCuraAPI().account.accessTokenChanged.connect(self._updateRequestHeader) # Signals: @@ -126,6 +125,14 @@ class Toolbox(QObject, Extension): showLicenseDialog = pyqtSignal() uninstallVariablesChanged = pyqtSignal() + def _loginStateChanged(self): + self._updateRequestHeader() + if self._application.getCuraAPI().account.isLoggedIn: + self.setViewPage("loading") + self._fetchPackageData() + else: + self.setViewPage("welcome") + def _updateRequestHeader(self): self._request_headers = [ (b"User-Agent", @@ -191,6 +198,8 @@ class Toolbox(QObject, Extension): "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)) } + self._application.getCuraAPI().account.loginStateChanged.connect(self._loginStateChanged) + if CuraApplication.getInstance().getPreferences().getValue("info/automatic_update_check"): # Request the latest and greatest! self._fetchPackageData() @@ -213,9 +222,9 @@ class Toolbox(QObject, Extension): # Gather installed packages: self._updateInstalledModels() + # Displays the toolbox @pyqtSlot() - def browsePackages(self) -> None: - self._fetchPackageData() + def launch(self) -> None: if not self._dialog: self._dialog = self._createDialog("Toolbox.qml") @@ -224,6 +233,12 @@ class Toolbox(QObject, Extension): Logger.log("e", "Unexpected error trying to create the 'Marketplace' dialog.") return + if self._application.getCuraAPI().account.isLoggedIn: + self.setViewPage("loading") + self._fetchPackageData() + else: + self.setViewPage("welcome") + self._dialog.show() # Apply enabled/disabled state to installed plugins diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 70d7cd422c..30e44d7d3b 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -160,7 +160,7 @@ Item target: Cura.Actions.browsePackages onTriggered: { - curaExtensions.callExtensionMethod("Toolbox", "browsePackages") + curaExtensions.callExtensionMethod("Toolbox", "launch") } } } \ No newline at end of file From 89b95b8998cf2c59e60ccc886e134e922030293b Mon Sep 17 00:00:00 2001 From: skriDude <56835828+skriDude@users.noreply.github.com> Date: Mon, 4 Nov 2019 15:59:31 +0100 Subject: [PATCH 868/994] Changed "values" to strings --- resources/definitions/skriware_2.def.json | 257 +++++++++++----------- 1 file changed, 130 insertions(+), 127 deletions(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index e3722cdacb..b3579c35ad 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -22,58 +22,58 @@ }, "overrides": { "jerk_print_layer_0": { - "value": 5 + "value": "5" }, "jerk_prime_tower": { - "value": 5 + "value": "5" }, "expand_skins_expand_distance": { - "value": 1.2 + "value": "1.2" }, "jerk_support_interface": { - "value": 5 + "value": "5" }, "jerk_travel_layer_0": { - "value": 5.0 + "value": "5.0" }, "wipe_retraction_prime_speed": { - "value": 30 + "value": "30" }, "material_standby_temperature": { "default_value": 195 }, "acceleration_support_bottom": { - "value": 250 + "value": "250" }, "raft_base_line_width": { - "value": 0.5 + "value": "0.5" }, "raft_speed": { - "value": 30.0 + "value": "30.0" }, "jerk_topbottom": { - "value": 5 + "value": "5" }, "ironing_inset": { - "value": 0.2 + "value": "0.2" }, "acceleration_wall": { - "value": 250 + "value": "250" }, "cross_infill_pocket_size": { - "value": 5.333333333333333 + "value": "5.333333333333333" }, "jerk_support_roof": { - "value": 5 + "value": "5" }, "acceleration_print": { "default_value": 250 }, "meshfix_maximum_travel_resolution": { - "value": 0.8 + "value": "0.8" }, "support_top_distance": { - "value": 0.22 + "value": "0.22" }, "acceleration_enabled": { "default_value": true @@ -82,28 +82,28 @@ "default_value": true }, "jerk_layer_0": { - "value": 5 + "value": "5" }, "infill_line_distance": { - "value": 5.333333333333333 + "value": "5.333333333333333" }, "acceleration_ironing": { "default_value": 250 }, "material_print_temperature_layer_0": { - "value": 195 + "value": "195" }, "machine_extruder_start_pos_x": { "default_value": 0 }, "bridge_skin_speed_2": { - "value": 15 + "value": "15" }, "acceleration_travel": { - "value": 250 + "value": "250" }, "switch_extruder_retraction_speed": { - "value": 30 + "value": "30" }, "machine_extruder_cooling_fan_number": { "default_value": 0 @@ -111,74 +111,77 @@ "jerk_print": { "default_value": 5 }, + "material_guid": { + "default_value": "0ff92885-617b-4144-a03c-9989872454bc" + }, "raft_interface_acceleration": { - "value": 250 + "value": "250" }, "acceleration_support_interface": { - "value": 250 + "value": "250" }, "cool_fan_full_layer": { - "value": 1 + "value": "1" }, "skirt_brim_minimal_length": { "default_value": 50 }, "material_bed_temperature": { - "value": 50 + "value": "50" }, "speed_slowdown_layers": { "default_value": 1 }, "speed_travel": { - "value": 150 + "value": "150" }, "skin_overlap": { - "value": 15 + "value": "15" }, "acceleration_infill": { - "value": 250 + "value": "250" }, "support_roof_material_flow": { - "value": 99 + "value": "99" }, "raft_base_jerk": { - "value": 5 + "value": "5" }, "retraction_retract_speed": { - "value": 30 + "value": "30" }, "infill_wipe_dist": { - "value": 0.1 + "value": "0.1" }, "jerk_wall_x": { - "value": 5 + "value": "5" }, "layer_height": { "default_value": 0.2 }, "bottom_skin_expand_distance": { - "value": 1.2000000000000002 + "value": "1.2000000000000002" }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 0}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management" }, "travel_retract_before_outer_wall": { "default_value": true }, "xy_offset_layer_0": { - "value": -0.16 + "value": "-0.16" }, "adhesion_type": { "default_value": "raft" }, "min_skin_width_for_expansion": { - "value": 0.671279704941824 + "value": "0.671279704941824" }, "support_bottom_material_flow": { - "value": 99 + "value": "99" }, "prime_tower_position_x": { - "value": 1 + "value": "1" }, "machine_depth": { "default_value": 260 @@ -196,22 +199,22 @@ "default_value": false }, "z_seam_x": { - "value": 115 + "value": "115" }, "support_xy_distance_overhang": { - "value": 0.5 + "value": "0.5" }, "support_tree_wall_thickness": { - "value": 0.4 + "value": "0.4" }, "acceleration_print_layer_0": { - "value": 250 + "value": "250" }, "support_xy_distance": { "default_value": 0.8 }, "support_roof_line_distance": { - "value": 0.5714285714285714 + "value": "0.5714285714285714" }, "jerk_enabled": { "default_value": true @@ -223,7 +226,7 @@ "default_value": true }, "bottom_layers": { - "value": 3 + "value": "3" }, "multiple_mesh_overlap": { "default_value": 0 @@ -232,28 +235,28 @@ "default_value": true }, "acceleration_topbottom": { - "value": 250 + "value": "250" }, "jerk_wall": { - "value": 5 + "value": "5" }, "jerk_wall_0": { - "value": 5 + "value": "5" }, "skin_overlap_mm": { - "value": 0.06 + "value": "0.06" }, "retraction_min_travel": { - "value": 1 + "value": "1" }, "support_interface_material_flow": { - "value": 99 + "value": "99" }, "material_diameter": { "default_value": 1.75 }, "speed_roofing": { - "value": 30.0 + "value": "30.0" }, "skin_outline_count": { "default_value": 0 @@ -265,10 +268,10 @@ "value": "zigzag" }, "top_skin_expand_distance": { - "value": 1.2000000000000002 + "value": "1.2000000000000002" }, "acceleration_travel_layer_0": { - "value": 250.0 + "value": "250.0" }, "prime_tower_min_volume": { "default_value": 4 @@ -277,28 +280,28 @@ "default_value": 30 }, "skin_preshrink": { - "value": 1.2000000000000002 + "value": "1.2000000000000002" }, "material_bed_temperature_layer_0": { - "value": 50 + "value": "50" }, "support_tree_collision_resolution": { - "value": 0.2 + "value": "0.2" }, "machine_height": { "default_value": 210 }, "raft_acceleration": { - "value": 250 + "value": "250" }, "fill_outline_gaps": { "default_value": true }, "wall_x_material_flow": { - "value": 99 + "value": "99" }, "jerk_support_bottom": { - "value": 5 + "value": "5" }, "machine_end_gcode": { "default_value": "M59\nG92 E1\nG1 E-1 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" @@ -310,19 +313,19 @@ "default_value": 0.005 }, "wall_0_material_flow": { - "value": 99 + "value": "99" }, "material_adhesion_tendency": { "default_value": 0 }, "prime_tower_flow": { - "value": 99 + "value": "99" }, "prime_tower_position_y": { - "value": 1 + "value": "1" }, "support_material_flow": { - "value": 99 + "value": "99" }, "machine_extruder_start_code": { "default_value": "" @@ -337,79 +340,79 @@ "default_value": 1.2 }, "support_infill_sparse_thickness": { - "value": 0.2 + "value": "0.2" }, "raft_surface_acceleration": { - "value": 250 + "value": "250" }, "machine_nozzle_offset_y": { "default_value": 0 }, "roofing_layer_count": { - "value": 1 + "value": "1" }, "skirt_brim_line_width": { - "value": 0.5 + "value": "0.5" }, "jerk_support": { - "value": 5 + "value": "5" }, "raft_surface_jerk": { - "value": 5 + "value": "5" }, "speed_equalize_flow_max": { "default_value": 40 }, "raft_surface_speed": { - "value": 30.0 + "value": "30.0" }, "jerk_travel": { - "value": 5 + "value": "5" }, "support_zag_skip_count": { - "value": 8 + "value": "8" }, "retraction_combing": { "default_value": "infill" }, "raft_interface_line_spacing": { - "value": 0.4 + "value": "0.4" }, "layer_height_0": { "default_value": 0.2 }, "extruders_enabled_count": { - "value": 2 + "value": "2" }, "support_line_distance": { - "value": 1.3333333333333333 + "value": "1.3333333333333333" }, "support_roof_density": { - "value": 70 + "value": "70" }, "raft_base_line_spacing": { - "value": 0.8 + "value": "0.8" }, "machine_extruder_end_pos_y": { "default_value": 0 }, "acceleration_prime_tower": { - "value": 250 + "value": "250" }, "skin_material_flow": { - "value": 99 + "value": "99" }, "support_z_distance": { "default_value": 0.22 }, "bottom_skin_preshrink": { - "value": 1.2000000000000002 + "value": "1.2000000000000002" }, "jerk_skirt_brim": { - "value": 5 + "value": "5" }, "z_seam_y": { - "value": 180 + "value": "180" }, "skirt_line_count": { "default_value": 2 @@ -418,76 +421,76 @@ "default_value": 4 }, "infill_material_flow": { - "value": 99 + "value": "99" }, "wipe_retraction_retract_speed": { - "value": 30 + "value": "30" }, "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, "support_roof_height": { - "value": 0.4 + "value": "0.4" }, "top_layers": { - "value": 4 + "value": "4" }, "support_infill_rate": { - "value": 30 + "value": "30" }, "raft_interface_speed": { - "value": 35 + "value": "35" }, "default_material_print_temperature": { "default_value": 195 }, "acceleration_layer_0": { - "value": 250 + "value": "250" }, "support_skip_zag_per_mm": { "default_value": 10 }, "material_initial_print_temperature": { - "value": 195 + "value": "195" }, "raft_interface_jerk": { - "value": 5 + "value": "5" }, "machine_width": { "default_value": 210 }, "wall_line_count": { - "value": 3 + "value": "3" }, "retraction_amount": { "default_value": 3 }, "infill_sparse_thickness": { - "value": 0.2 + "value": "0.2" }, "support_initial_layer_line_distance": { - "value": 1.3333333333333333 + "value": "1.3333333333333333" }, "jerk_support_infill": { - "value": 5 + "value": "5" }, "acceleration_roofing": { - "value": 250 + "value": "250" }, "retraction_extrusion_window": { - "value": 3 + "value": "3" }, "raft_interface_line_width": { - "value": 0.4 + "value": "0.4" }, "acceleration_support_roof": { - "value": 250 + "value": "250" }, "support_brim_line_count": { - "value": 16 + "value": "16" }, "layer_0_z_overlap": { - "value": 0.1 + "value": "0.1" }, "support_angle": { "default_value": 60 @@ -496,13 +499,13 @@ "default_value": true }, "raft_surface_thickness": { - "value": 0.2 + "value": "0.2" }, "cool_min_layer_time": { "default_value": 10 }, "gantry_height": { - "value": 210 + "value": "210" }, "raft_airgap": { "default_value": 0.2 @@ -511,16 +514,16 @@ "default_value": 0 }, "acceleration_skirt_brim": { - "value": 250 + "value": "250" }, "skirt_brim_material_flow": { - "value": 99 + "value": "99" }, "jerk_infill": { - "value": 5 + "value": "5" }, "roofing_material_flow": { - "value": 99 + "value": "99" }, "extruder_nr": { "default_value": 0 @@ -538,10 +541,10 @@ "default_value": "" }, "speed_travel_layer_0": { - "value": 75.0 + "value": "75.0" }, "raft_base_acceleration": { - "value": 250 + "value": "250" }, "retraction_count_max": { "default_value": 40 @@ -550,7 +553,7 @@ "default_value": 4 }, "acceleration_support": { - "value": 250 + "value": "250" }, "max_skin_angle_for_expansion": { "default_value": 50 @@ -562,19 +565,19 @@ "default_value": 10 }, "acceleration_support_infill": { - "value": 250 + "value": "250" }, "machine_extruder_start_pos_abs": { "default_value": false }, "retraction_prime_speed": { - "value": 30 + "value": "30" }, "raft_base_speed": { - "value": 35 + "value": "35" }, "acceleration_wall_0": { - "value": 250 + "value": "250" }, "xy_offset": { "default_value": -0.16 @@ -586,34 +589,34 @@ "default_value": 1 }, "jerk_ironing": { - "value": 5 + "value": "5" }, "switch_extruder_prime_speed": { - "value": 30 + "value": "30" }, "raft_jerk": { - "value": 5 + "value": "5" }, "top_skin_preshrink": { - "value": 1.2000000000000002 + "value": "1.2000000000000002" }, "material_print_temperature": { - "value": 195 + "value": "195" }, "wall_material_flow": { - "value": 99 + "value": "99" }, "jerk_roofing": { - "value": 5 + "value": "5" }, "cool_fan_full_at_height": { - "value": 0 + "value": "0" }, "acceleration_wall_x": { - "value": 250 + "value": "250" }, "support_bottom_distance": { - "value": 0.23 + "value": "0.23" }, "cool_min_speed": { "default_value": 15 @@ -622,7 +625,7 @@ "default_value": 50 }, "raft_interface_thickness": { - "value": 0.2 + "value": "0.2" }, "machine_extruder_end_pos_abs": { "default_value": false From 2e3c3c7bd057f2dfa376e8ccb687b96333bae15e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 16:07:15 +0100 Subject: [PATCH 869/994] Change the engineering intent tooltip (again) Let's hope that this is the final one... CURA-6890 --- cura/Machines/Models/IntentCategoryModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index b149852462..cb81aec3c7 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -41,7 +41,7 @@ class IntentCategoryModel(ListModel): } _translations["engineering"] = { "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of improved accuracy and for tighter tolerances.") + "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances.") } _translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), From 3e13156741e63b196ffea3909abc43ec672d393c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 13:40:13 +0100 Subject: [PATCH 870/994] Replace logo in the top left corner This aligns it with the other Ultimaker products. Sorry, overruled by higher up. Corporate things. Contributes to issue CURA-6934. --- resources/themes/cura-light/images/logo.svg | 53 +++++++-------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index 814b157e2a..24d8da8c46 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -1,37 +1,18 @@ - - - - - - - + + + + + + + + + + + + + + + + + From fcd712cf8272dc922454fa324e97bb869078444b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 13:50:42 +0100 Subject: [PATCH 871/994] Make logo larger Seems to be more towards what the rest of the products show. Contributes to issue CURA-6934. --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 0d9f624805..055f176b33 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -483,7 +483,7 @@ "default_lining": [0.08, 0.08], "default_arrow": [0.8, 0.8], - "logo": [8, 1.75], + "logo": [16, 3.5], "wide_margin": [2.0, 2.0], "thick_margin": [1.71, 1.43], From 726cf3b7a4486c09a8c7f224d84ff4ecd8bb4f4e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 Oct 2019 14:05:35 +0100 Subject: [PATCH 872/994] Fix typo in the R Contributes to issue CURA-6934. --- resources/themes/cura-light/images/logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index 24d8da8c46..611840e248 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -12,7 +12,7 @@ - + From 7af5f132e07af6e3bdb2f848ca3f331116f40f8e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 4 Nov 2019 16:15:00 +0100 Subject: [PATCH 873/994] Only show toolbox/marketplace welcome screen for Essentials builds CURA-6569 --- plugins/Toolbox/src/Toolbox.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 9f8273d6e8..9caf95eab0 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -125,13 +125,15 @@ class Toolbox(QObject, Extension): showLicenseDialog = pyqtSignal() uninstallVariablesChanged = pyqtSignal() - def _loginStateChanged(self): + ## Go back to the start state (welcome screen or loading if no login required) + def _restart(self): self._updateRequestHeader() - if self._application.getCuraAPI().account.isLoggedIn: + # For an Essentials build, login is mandatory + if not self._application.getCuraAPI().account.isLoggedIn and ApplicationMetadata.CuraBuildType == "essentials": + self.setViewPage("welcome") + else: self.setViewPage("loading") self._fetchPackageData() - else: - self.setViewPage("welcome") def _updateRequestHeader(self): self._request_headers = [ @@ -198,7 +200,7 @@ class Toolbox(QObject, Extension): "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)) } - self._application.getCuraAPI().account.loginStateChanged.connect(self._loginStateChanged) + self._application.getCuraAPI().account.loginStateChanged.connect(self._restart) if CuraApplication.getInstance().getPreferences().getValue("info/automatic_update_check"): # Request the latest and greatest! @@ -233,11 +235,7 @@ class Toolbox(QObject, Extension): Logger.log("e", "Unexpected error trying to create the 'Marketplace' dialog.") return - if self._application.getCuraAPI().account.isLoggedIn: - self.setViewPage("loading") - self._fetchPackageData() - else: - self.setViewPage("welcome") + self._restart() self._dialog.show() From f1b9ac1c2128f394f1aa7bc151e5c29c4cd4e24e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 16:15:24 +0100 Subject: [PATCH 874/994] Fix aspect ratio of logo in about window CURA-6934 --- resources/qml/Dialogs/AboutDialog.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 584903dd60..a5622aa2c9 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -41,6 +41,7 @@ UM.Dialog source: UM.Theme.getImage("logo") sourceSize.width: width sourceSize.height: height + fillMode: Image.PreserveAspectFit anchors.top: parent.top anchors.topMargin: parent.topPadding From 74d52bbd1ca744cbb5fbbf82f84cac2c6383f8c9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 4 Nov 2019 16:18:46 +0100 Subject: [PATCH 875/994] Fix complaints from CI system about settings that don't work There's one that needed to be a 'value' to properly overwrite it. The rest are all about settings that were equal to the defaults anyway so I've removed those. Contributes to issue CURA-6949. --- resources/definitions/skriware_2.def.json | 38 +---------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index b3579c35ad..5d1aeaad0e 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -88,14 +88,11 @@ "value": "5.333333333333333" }, "acceleration_ironing": { - "default_value": 250 + "value": "250" }, "material_print_temperature_layer_0": { "value": "195" }, - "machine_extruder_start_pos_x": { - "default_value": 0 - }, "bridge_skin_speed_2": { "value": "15" }, @@ -105,9 +102,6 @@ "switch_extruder_retraction_speed": { "value": "30" }, - "machine_extruder_cooling_fan_number": { - "default_value": 0 - }, "jerk_print": { "default_value": 5 }, @@ -186,9 +180,6 @@ "machine_depth": { "default_value": 260 }, - "machine_extruder_start_pos_y": { - "default_value": 0 - }, "retraction_speed": { "default_value": 30 }, @@ -327,9 +318,6 @@ "support_material_flow": { "value": "99" }, - "machine_extruder_start_code": { - "default_value": "" - }, "retract_at_layer_change": { "default_value": true }, @@ -345,9 +333,6 @@ "raft_surface_acceleration": { "value": "250" }, - "machine_nozzle_offset_y": { - "default_value": 0 - }, "roofing_layer_count": { "value": "1" }, @@ -393,9 +378,6 @@ "raft_base_line_spacing": { "value": "0.8" }, - "machine_extruder_end_pos_y": { - "default_value": 0 - }, "acceleration_prime_tower": { "value": "250" }, @@ -510,9 +492,6 @@ "raft_airgap": { "default_value": 0.2 }, - "machine_extruder_end_pos_x": { - "default_value": 0 - }, "acceleration_skirt_brim": { "value": "250" }, @@ -525,9 +504,6 @@ "roofing_material_flow": { "value": "99" }, - "extruder_nr": { - "default_value": 0 - }, "support_use_towers": { "default_value": false }, @@ -537,9 +513,6 @@ "material_flow": { "default_value": 99 }, - "machine_extruder_end_code": { - "default_value": "" - }, "speed_travel_layer_0": { "value": "75.0" }, @@ -567,9 +540,6 @@ "acceleration_support_infill": { "value": "250" }, - "machine_extruder_start_pos_abs": { - "default_value": false - }, "retraction_prime_speed": { "value": "30" }, @@ -582,9 +552,6 @@ "xy_offset": { "default_value": -0.16 }, - "machine_nozzle_offset_x": { - "default_value": 0 - }, "prime_tower_size": { "default_value": 1 }, @@ -626,9 +593,6 @@ }, "raft_interface_thickness": { "value": "0.2" - }, - "machine_extruder_end_pos_abs": { - "default_value": false } } } From 0b76f221b44e8d00fccf726f548dbfa125af7771 Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 16:28:35 +0100 Subject: [PATCH 876/994] Delete leapfrog_bolt_pro.def.json --- .../definitions/leapfrog_bolt_pro.def.json | 118 ------------------ 1 file changed, 118 deletions(-) delete mode 100644 resources/definitions/leapfrog_bolt_pro.def.json diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json deleted file mode 100644 index 06cf956a2f..0000000000 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ /dev/null @@ -1,118 +0,0 @@ - { - "version": 2, - "name": "Leapfrog Bolt Pro", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Karan and Vincent 20191104", - "manufacturer": "Leapfrog B.V.", - "category": "Other", - "platform": "leapfrog_bolt_pro_platform.stl", - "platform_offset": [0, 0, -14], - "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "supports_network_connection": false, - "has_materials": true, - "preferred_material": "leapfrog", - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Brass 0.4", - "preferred_material": "leapfrog_epla_natural", - "variants_name": "Hot end", - "exclude_materials": [ - "generic_pla_175", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tpu_175", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pva", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - - "machine_extruder_trains": - { - "0": "leapfrog_bolt_pro_extruder_right", - "1": "leapfrog_bolt_pro_extruder_left" - } - }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Bolt Pro" }, - "machine_extruder_count": {"default_value": 2}, - "machine_center_is_zero": {"default_value": false}, - "machine_width": {"default_value": 302}, - "machine_height": {"default_value": 205}, - "machine_depth": {"default_value": 322}, - "machine_heated_bed": {"default_value": true}, - "machine_head_with_fans_polygon": {"default_value": [[-1, 1 ], [1, 1], [1, -1 ], [-1, -1]]}, - "machine_max_feedrate_z": {"default_value": 16.7 }, - "machine_max_feedrate_e": {"default_value": 50 }, - "machine_max_acceleration_z": {"default_value": 100 }, - "machine_acceleration": {"default_value": 400 }, - "machine_max_jerk_xy": {"default_value": 20 }, - "machine_max_jerk_z": {"default_value": 0.4 }, - "machine_max_jerk_e": {"default_value": 5 }, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "material_final_print_temperature": {"value": "default_material_print_temperature" }, - "material_initial_print_temperature": {"value": "default_material_print_temperature" }, - "gantry_height": {"value": "60"}, - "retraction_combing": { "default_value": "all" }, - "retraction_amount": {"default_value": 2}, - "adhesion_type": {"default_value": "skirt"}, - "skirt_line_count": {"default_value": 3}, - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, - "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, - "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, - "prime_tower_circular": {"default_value": false}, - "prime_tower_position_x": {"value": "169"}, - "prime_tower_position_y": {"value": "25"}, - "speed_travel": { "value": "200"}, - "build_volume_temperature": {"enabled": false}, - "material_standby_temperature": {"enabled": false } - } -} \ No newline at end of file From c30ec406cf5fe001781c4c43543ea9cb2d88606f Mon Sep 17 00:00:00 2001 From: Vincent Riemens <36920227+VincentRiemens@users.noreply.github.com> Date: Mon, 4 Nov 2019 16:28:55 +0100 Subject: [PATCH 877/994] Add files via upload --- .../definitions/leapfrog_bolt_pro.def.json | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 resources/definitions/leapfrog_bolt_pro.def.json diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json new file mode 100644 index 0000000000..09e3d77007 --- /dev/null +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -0,0 +1,118 @@ + { + "version": 2, + "name": "Leapfrog Bolt Pro", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Karan and Vincent 20191104", + "manufacturer": "Leapfrog B.V.", + "category": "Other", + "platform": "leapfrog_bolt_pro_platform.stl", + "platform_offset": [0, 0, -14], + "file_formats": "text/x-gcode", + "supports_usb_connection": false, + "supports_network_connection": false, + "has_materials": true, + "preferred_material": "leapfrog", + "has_machine_quality": true, + "has_variants": true, + "preferred_variant_name": "Brass 0.4", + "preferred_material": "leapfrog_epla_natural", + "variants_name": "Hot end", + "exclude_materials": [ + "generic_pla_175", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pva", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + + "machine_extruder_trains": + { + "0": "leapfrog_bolt_pro_extruder_right", + "1": "leapfrog_bolt_pro_extruder_left" + } + }, + "overrides": { + "machine_name": {"default_value": "Leapfrog Bolt Pro" }, + "machine_extruder_count": {"default_value": 2}, + "machine_center_is_zero": {"default_value": false}, + "machine_width": {"default_value": 302}, + "machine_height": {"default_value": 205}, + "machine_depth": {"default_value": 322}, + "machine_heated_bed": {"default_value": true}, + "machine_head_with_fans_polygon": {"default_value": [[-60, 110 ], [-60, -45], [60, -45 ], [60, 110]]}, + "machine_max_feedrate_z": {"default_value": 16.7 }, + "machine_max_feedrate_e": {"default_value": 50 }, + "machine_max_acceleration_z": {"default_value": 100 }, + "machine_acceleration": {"default_value": 400 }, + "machine_max_jerk_xy": {"default_value": 20 }, + "machine_max_jerk_z": {"default_value": 0.4 }, + "machine_max_jerk_e": {"default_value": 5 }, + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "material_final_print_temperature": {"value": "default_material_print_temperature" }, + "material_initial_print_temperature": {"value": "default_material_print_temperature" }, + "gantry_height": {"value": "20"}, + "retraction_combing": { "default_value": "all" }, + "retraction_amount": {"default_value": 2}, + "adhesion_type": {"default_value": "skirt"}, + "skirt_line_count": {"default_value": 3}, + "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, + "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, + "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, + "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, + "prime_tower_circular": {"default_value": false}, + "prime_tower_position_x": {"value": "169"}, + "prime_tower_position_y": {"value": "25"}, + "speed_travel": { "value": "200"}, + "build_volume_temperature": {"enabled": false}, + "material_standby_temperature": {"enabled": false } + } +} \ No newline at end of file From b34c0e8eb77f736cee388b4ac126946c283e16e8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 4 Nov 2019 16:35:49 +0100 Subject: [PATCH 878/994] Don't check A: and B: drives for USB sticks Fixes #2438. --- .../WindowsRemovableDrivePlugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py index 51b6a70b7a..c89bd31e21 100644 --- a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py @@ -48,9 +48,13 @@ class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): drives = {} bitmask = ctypes.windll.kernel32.GetLogicalDrives() - # Check possible drive letters, from A to Z + # Check possible drive letters, from C to Z # Note: using ascii_uppercase because we do not want this to change with locale! - for letter in string.ascii_uppercase: + # Skip A and B, since those drives are typically reserved for floppy disks. + # Those drives can theoretically be reassigned but it's safer to not check them for removable drives. + # Windows will also behave weirdly even with some of its internal functions if you do this (e.g. search indexing doesn't search it). + # Users that have removable drives in A or B will just have to save to file and select the drive there. + for letter in string.ascii_uppercase[2:]: drive = "{0}:/".format(letter) # Do we really want to skip A and B? From f48a5ec028e244a45336d373c8f9095cac4b7c12 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 4 Nov 2019 16:43:54 +0100 Subject: [PATCH 879/994] Fix zigzag initial layer pattern for Skriware 2 --- resources/definitions/skriware_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 5d1aeaad0e..584cdd1708 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -256,7 +256,7 @@ "default_value": true }, "top_bottom_pattern_0": { - "value": "zigzag" + "value": "'zigzag'" }, "top_skin_expand_distance": { "value": "1.2000000000000002" From 9d9d82dc242d418d09c8769cff9a9abfddf0bee9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 4 Nov 2019 16:58:57 +0100 Subject: [PATCH 880/994] Make logging when using a fallback for preferred material more explicit CURA-6950 --- cura/Machines/VariantNode.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index b93be9773e..8275c70e62 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -88,6 +88,7 @@ class VariantNode(ContainerNode): # First fallback: Choose any material with matching diameter. for material_node in self.materials.values(): if material_node.getMetaDataEntry("approximate_diameter") and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + Logger.log("w", "Could not find preferred material %s, falling back to whatever works", self.machine.preferred_material) return material_node fallback = next(iter(self.materials.values())) # Should only happen with empty material node. Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format( From ed7134ded888d2276ea7d947c926edb82deff82b Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 4 Nov 2019 17:35:24 +0100 Subject: [PATCH 881/994] Organize Toolbox (marketplace) qml files according to type CURA-6569 --- cura/ApplicationMetadata.py | 2 +- plugins/Toolbox/resources/qml/Toolbox.qml | 4 ++++ .../Toolbox/resources/qml/{ => components}/RatingWidget.qml | 0 .../resources/qml/{ => components}/SmallRatingWidget.qml | 0 .../qml/{ => components}/ToolboxActionButtonStyle.qml | 0 .../resources/qml/{ => components}/ToolboxBackColumn.qml | 0 .../qml/{ => components}/ToolboxCompatibilityChart.qml | 0 .../resources/qml/{ => components}/ToolboxDetailList.qml | 0 .../resources/qml/{ => components}/ToolboxDetailTile.qml | 0 .../qml/{ => components}/ToolboxDetailTileActions.qml | 0 .../resources/qml/{ => components}/ToolboxDownloadsGrid.qml | 0 .../qml/{ => components}/ToolboxDownloadsGridTile.qml | 4 ++-- .../qml/{ => components}/ToolboxDownloadsShowcase.qml | 0 .../qml/{ => components}/ToolboxDownloadsShowcaseTile.qml | 4 ++-- .../Toolbox/resources/qml/{ => components}/ToolboxFooter.qml | 0 .../Toolbox/resources/qml/{ => components}/ToolboxHeader.qml | 0 .../resources/qml/{ => components}/ToolboxInstalledTile.qml | 0 .../qml/{ => components}/ToolboxInstalledTileActions.qml | 0 .../resources/qml/{ => components}/ToolboxProgressButton.qml | 0 .../Toolbox/resources/qml/{ => components}/ToolboxShadow.qml | 0 .../resources/qml/{ => components}/ToolboxTabButton.qml | 0 .../qml/{ => dialogs}/ToolboxConfirmUninstallResetDialog.qml | 2 +- .../resources/qml/{ => dialogs}/ToolboxLicenseDialog.qml | 0 .../Toolbox/resources/qml/{ => pages}/ToolboxAuthorPage.qml | 4 +++- .../Toolbox/resources/qml/{ => pages}/ToolboxDetailPage.qml | 4 +++- .../resources/qml/{ => pages}/ToolboxDownloadsPage.qml | 2 ++ .../Toolbox/resources/qml/{ => pages}/ToolboxErrorPage.qml | 0 .../resources/qml/{ => pages}/ToolboxInstalledPage.qml | 2 ++ .../Toolbox/resources/qml/{ => pages}/ToolboxLoadingPage.qml | 0 plugins/Toolbox/resources/qml/{ => pages}/WelcomePage.qml | 2 +- plugins/Toolbox/src/Toolbox.py | 2 +- 31 files changed, 22 insertions(+), 10 deletions(-) rename plugins/Toolbox/resources/qml/{ => components}/RatingWidget.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/SmallRatingWidget.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxActionButtonStyle.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxBackColumn.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxCompatibilityChart.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDetailList.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDetailTile.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDetailTileActions.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDownloadsGrid.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDownloadsGridTile.qml (97%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDownloadsShowcase.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxDownloadsShowcaseTile.qml (97%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxFooter.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxHeader.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxInstalledTile.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxInstalledTileActions.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxProgressButton.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxShadow.qml (100%) rename plugins/Toolbox/resources/qml/{ => components}/ToolboxTabButton.qml (100%) rename plugins/Toolbox/resources/qml/{ => dialogs}/ToolboxConfirmUninstallResetDialog.qml (96%) rename plugins/Toolbox/resources/qml/{ => dialogs}/ToolboxLicenseDialog.qml (100%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxAuthorPage.qml (98%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxDetailPage.qml (99%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxDownloadsPage.qml (98%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxErrorPage.qml (100%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxInstalledPage.qml (99%) rename plugins/Toolbox/resources/qml/{ => pages}/ToolboxLoadingPage.qml (100%) rename plugins/Toolbox/resources/qml/{ => pages}/WelcomePage.qml (97%) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index daa937197c..4dced1c4dc 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -7,7 +7,7 @@ DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" -DEFAULT_CURA_BUILD_TYPE = "" +DEFAULT_CURA_BUILD_TYPE = "essentials" DEFAULT_CURA_DEBUG_MODE = False DEFAULT_CURA_SDK_VERSION = "7.0.0" diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index cf69231428..03fd3468f6 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -8,6 +8,10 @@ import QtQuick.Dialogs 1.1 import QtQuick.Window 2.2 import UM 1.1 as UM +import "./pages" +import "./dialogs" +import "./components" + Window { id: base diff --git a/plugins/Toolbox/resources/qml/RatingWidget.qml b/plugins/Toolbox/resources/qml/components/RatingWidget.qml similarity index 100% rename from plugins/Toolbox/resources/qml/RatingWidget.qml rename to plugins/Toolbox/resources/qml/components/RatingWidget.qml diff --git a/plugins/Toolbox/resources/qml/SmallRatingWidget.qml b/plugins/Toolbox/resources/qml/components/SmallRatingWidget.qml similarity index 100% rename from plugins/Toolbox/resources/qml/SmallRatingWidget.qml rename to plugins/Toolbox/resources/qml/components/SmallRatingWidget.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxActionButtonStyle.qml b/plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxActionButtonStyle.qml rename to plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxBackColumn.qml rename to plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml rename to plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailList.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxDetailList.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDetailList.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailTile.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxDetailTile.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDetailTile.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGrid.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDownloadsGrid.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml similarity index 97% rename from plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml index 73dd593336..78cdf1562a 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml @@ -67,7 +67,7 @@ Item width: UM.Theme.getSize("toolbox_thumbnail_small").width - UM.Theme.getSize("wide_margin").width height: UM.Theme.getSize("toolbox_thumbnail_small").height - UM.Theme.getSize("wide_margin").width fillMode: Image.PreserveAspectFit - source: model.icon_url || "../images/logobot.svg" + source: model.icon_url || "../../images/logobot.svg" mipmap: true } UM.RecolorImage @@ -82,7 +82,7 @@ Item sourceSize.height: height visible: installedPackages != 0 color: (installedPackages >= packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border") - source: "../images/installed_check.svg" + source: "../../images/installed_check.svg" } } Item diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml similarity index 97% rename from plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml rename to plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml index 89348b18de..f6e32b2d84 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml @@ -23,7 +23,7 @@ Rectangle height: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height width: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height fillMode: Image.PreserveAspectFit - source: model.icon_url || "../images/logobot.svg" + source: model.icon_url || "../../images/logobot.svg" mipmap: true anchors { @@ -62,7 +62,7 @@ Rectangle } visible: installedPackages != 0 color: (installedPackages >= packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border") - source: "../images/installed_check.svg" + source: "../../images/installed_check.svg" } SmallRatingWidget diff --git a/plugins/Toolbox/resources/qml/ToolboxFooter.qml b/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxFooter.qml rename to plugins/Toolbox/resources/qml/components/ToolboxFooter.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxHeader.qml rename to plugins/Toolbox/resources/qml/components/ToolboxHeader.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml rename to plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml rename to plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml b/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxProgressButton.qml rename to plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxShadow.qml b/plugins/Toolbox/resources/qml/components/ToolboxShadow.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxShadow.qml rename to plugins/Toolbox/resources/qml/components/ToolboxShadow.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxTabButton.qml b/plugins/Toolbox/resources/qml/components/ToolboxTabButton.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxTabButton.qml rename to plugins/Toolbox/resources/qml/components/ToolboxTabButton.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml b/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml similarity index 96% rename from plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml rename to plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml index 81649fdfef..1b5e4d1d46 100644 --- a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml +++ b/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml @@ -14,7 +14,7 @@ import Cura 1.0 as Cura UM.Dialog { - // This dialog asks the user whether he/she wants to open a project file as a project or import models. + // This dialog asks the user to confirm he/she wants to uninstall materials/pprofiles which are currently in use id: base title: catalog.i18nc("@title:window", "Confirm uninstall") + toolbox.pluginToUninstall diff --git a/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml b/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml rename to plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml similarity index 98% rename from plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml index 08ac1f83a5..d1abe48de1 100644 --- a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml @@ -6,6 +6,8 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import UM 1.1 as UM +import "../components" + Item { id: page @@ -31,7 +33,7 @@ Item width: UM.Theme.getSize("toolbox_thumbnail_medium").width height: UM.Theme.getSize("toolbox_thumbnail_medium").height fillMode: Image.PreserveAspectFit - source: details.icon_url || "../images/logobot.svg" + source: details.icon_url || "../../images/logobot.svg" mipmap: true anchors { diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml similarity index 99% rename from plugins/Toolbox/resources/qml/ToolboxDetailPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml index 1773ef9053..6d34e23f42 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml @@ -8,6 +8,8 @@ import UM 1.1 as UM import Cura 1.1 as Cura +import "../components" + Item { id: page @@ -44,7 +46,7 @@ Item { anchors.fill: parent fillMode: Image.PreserveAspectFit - source: details === null ? "" : (details.icon_url || "../images/logobot.svg") + source: details === null ? "" : (details.icon_url || "../../images/logobot.svg") mipmap: true } } diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxDownloadsPage.qml similarity index 98% rename from plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxDownloadsPage.qml index 57fb3a9279..9be8cbe2b9 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxDownloadsPage.qml @@ -5,6 +5,8 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import UM 1.1 as UM +import "../components" + ScrollView { clip: true diff --git a/plugins/Toolbox/resources/qml/ToolboxErrorPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxErrorPage.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxErrorPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxErrorPage.qml diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml similarity index 99% rename from plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml index f4a9e634c4..99590c712c 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml @@ -6,6 +6,8 @@ import QtQuick.Controls 2.3 import UM 1.1 as UM +import "../components" + ScrollView { id: page diff --git a/plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml similarity index 100% rename from plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml rename to plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml diff --git a/plugins/Toolbox/resources/qml/WelcomePage.qml b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml similarity index 97% rename from plugins/Toolbox/resources/qml/WelcomePage.qml rename to plugins/Toolbox/resources/qml/pages/WelcomePage.qml index a89b490b51..cbfdf8f402 100644 --- a/plugins/Toolbox/resources/qml/WelcomePage.qml +++ b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml @@ -20,7 +20,7 @@ Column { id: profileImage fillMode: Image.PreserveAspectFit - source: "../images/logobot.svg" + source: "../../images/logobot.svg" anchors.horizontalCenter: parent.horizontalCenter width: Math.round(parent.width / 4) } diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 9caf95eab0..a31b818b37 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -342,7 +342,7 @@ class Toolbox(QObject, Extension): self._package_used_qualities = package_used_qualities # Ask change to default material / profile if self._confirm_reset_dialog is None: - self._confirm_reset_dialog = self._createDialog("ToolboxConfirmUninstallResetDialog.qml") + self._confirm_reset_dialog = self._createDialog("dialogs/ToolboxConfirmUninstallResetDialog.qml") self.uninstallVariablesChanged.emit() if self._confirm_reset_dialog is None: Logger.log("e", "ToolboxConfirmUninstallResetDialog should have been initialized, but it is not. Not showing dialog and not uninstalling package.") From 366dd4bd00e4af362360a81a2b78d9e9b5295372 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Nov 2019 09:33:50 +0100 Subject: [PATCH 882/994] Swap the splashscreen image RIP Ultibot :( CURA-6656 --- cura/UI/CuraSplashScreen.py | 8 ++++---- resources/images/cura.png | Bin 33083 -> 25786 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index 77c9ad1427..05231c106d 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -56,11 +56,11 @@ class CuraSplashScreen(QSplashScreen): if buildtype: version[0] += " (%s)" % buildtype - # draw version text + # Draw version text font = QFont() # Using system-default font here font.setPixelSize(37) painter.setFont(font) - painter.drawText(215, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0]) + painter.drawText(60, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0]) if len(version) > 1: font.setPixelSize(16) painter.setFont(font) @@ -68,14 +68,14 @@ class CuraSplashScreen(QSplashScreen): painter.drawText(247, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1]) painter.setPen(QColor(255, 255, 255, 255)) - # draw the loading image + # Draw the loading image pen = QPen() pen.setWidth(6 * self._scale) pen.setColor(QColor(32, 166, 219, 255)) painter.setPen(pen) painter.drawArc(60, 150, 32 * self._scale, 32 * self._scale, self._loading_image_rotation_angle * 16, 300 * 16) - # draw message text + # Draw message text if self._current_message: font = QFont() # Using system-default font here font.setPixelSize(13) diff --git a/resources/images/cura.png b/resources/images/cura.png index 4fef842ff4d6425401c45d29360875d97bcef2f7..2d6a75f571a167005b87db68f47dbcb2bdc70d12 100644 GIT binary patch literal 25786 zcmcG$cQ}{t`#*k58IhE%G8-s+Zz?6SrLypHJdxv4@*+ldHXH`Vc7`S#?l$&tHHL{v zy4xEVS(!L97@C+_*oq&VeqM2q!NOSl;6;7~E(Loj6LSk0Pe+q;o{DNlo>oS}#s?)O z7{uH~;087(&ISzbHrBRIBJSb`x9%$fKckO14>D|B;%p^;@C14wgSvt;gOr`42?IZe z0J{-4A3uYjFbB5)FQ2e58v_p)w-6_n5GOY;JGX!cAD0LZ55tc?2jOXs#-<{wr=)*8 z3;rj5(A?SCUWAj=&CQL&jhDmD(TtN@SXh{oi-(hkhaIk9ck-}xHgIRRbvpF(4yR0< zj2tcOoh|Ha8PFXK4DDQ;#Sg+rzrTWw{Xe(0b^0+)FkzhT2KJoX99-y?eqN}c@PA)w zWAo3|PR^%Y;VD1H`_~&gsd?C&aH^U(*||6xnVfbtv2{N5^I^tD|9scp#nF1}O^uB> zO{`69;4&u|823MqvNyMLwsSJK`+vO0KfnIxZR|y)98Crih;Rw9a&e1raecp30gS=e zz}et`yV%ay!qnq`xl}UK^PQ=g@v(*F)xo1KffU_yD>LE4?7>1 zp((o%7ncybfQg`iF_$4XKc9)|*0|vNr|gVe&>W)gf45y@J0rNqKhq?_ZE7lLWWdYC z&L=2nz;4RNXUHyWWNOSVC?Fs#AZWnDC%|X)^KMFx7O;H`tbe^L8kI5J(ZGaXfRD!% z=7`?_Zf3wI%q}b_WXR4Zz{MjVz+=EGECi!6HWD$lbF?u4W3jL?Ff-w_w>3M+@b74( z?5yn^73_>*&Ut_RTvkd-+0o9_!Ww?zq-+|G&roV}gy$4Q$O!z~OQpL~q22T+{dE z;rw&uwtn}E8~b@V_(t^OKTa9`^N(9Mv4vYZg44#mkfVcPy85!GPN=!xn~ZnU-*>*_ zbyIvUKjYQ8ZH&i1v)mUX@KU}Pj@w3&G8eW|L;jjUzyOCy))BIgm&iqU&!rj7l@yiU=rPxK^rAEOGm8N3l% z9-rA$cY1(4tZ>4pI%zypSnc)wUPfQZIHvj9>B$v!?z9z4lJkR+T3FlA=rUEQ4m~U0 zdA)}F8TWXIk~G)E=>7ls;x#8F9JP?dQKPS}K3P<1KK$3l9nbDNp19Y{Y{T#ZHj)5U*GYRbjp9eJN(vOPLS$iVN^&tE6vaGz4#bun&js1@W*iE z6*Y)kZMh!XvQqk76#DmJN5e0-?|R*4GxA`1XHCz1j-m2=8x5B*Ik$4j%c7EO?Kz#n zpKprGl*$uW->0wLcY$N&vHj2KhIb$jltUj=_%r_c9_h!DU-#)}92(*X{ACiDQbj`d zyZEO+4icqOJuvli8Sma3=Mn2CA^PJMgq6vYPq}`-FqTKG{m%;>t`6RERi`3O-?jL2 z0p!Cnb&JYqDe$Czop1lat6Dt<23!vXdjEY}b={)u|6DkBRjd2Y3p;g_3M*gf%lx`B zy@NX}McIgdd&e3b-K6~gTsXGl?0+uo(=F;H$rLf1>ZI@={%101l-vhZMYG0(4eUZ* z{$o<|VX38Q4x(AHK?b(Jeau{@Z<(cr%bjJzE!4SE6Gl5bGc&`8VVi5SyCt1Jzk3z? z8Grlso3#nQD)Z)&?cj{1+b9WcoDLv85uVdKQjODk=qQA73 zb0}tY()iXPDN7&gu+*|N2b@UH)Z$k$55p)+BfyXnNt3%jQJZaBWdF_NK`Qz*<<`9225 zfa94LvOl+HYrP+;;Fcc|i0ltE(cp@aZ)+hTAz{+Yj=tMq$|x%O{OyoN<^^`u=FJeP zai64dGAbc^22q!BH5+|>hMX>I`K1@$5!Q`a9^vBQh$KP%0Hq~np zC+=0CVJoapoNnY`(ql<^Jl!ppm4j(RFcN^wa@>rnBl<+B8<0bS2Gblfj%Cy7zPAZS{jL!>@0Q zx%GRT8C@$5msok@Ir~YWT<#9XTR$9Jn#A>?5Ke2eri76yv3~Dag?Pn_rDLTYvuvh$ z8lPKIhg~tdr{BFMAU1+`nnw7=*$b;-R}qq3FY%l8`3_1Hm@`1+Z)$_2Z{bGSngV% z&Gp6hj~_oenw^Ncp%^d1-Ka;3es^heRgb7?b9Zen8!?^O-O2Xs1LvOTiq~~?+}XEp zAHf|?y-&Mog!BhWTr#t>;)pp*zg`g#6T63DY+40xZ{NDbNJWgt<2h%pusGEhbMq#t zs=7Lh{9Ue>ky;i$%geU{ z0=9qpHd4PfaA{M=kpAkmYv*iw3Q{gDk5GE4sNB-$qLO){TXvU8Ay%1BA>zvyYv1>e z6bhcZP49eAE}eW?z^0o^A(rp{l`B^W6y6_ZWf)^ z$azS@HqU8P(W}t5?=EccXWQkp{gmY8jV0H9c^l}IIH#8z)r1{cC`?SGPd}GR z(pGWllIzCW@~7$Y)yJoH+-KP-VB2eM-dn`I%Oo@@iD54#<(Xad68F~U-YaF-N3*kT zdc-?QdwYwmZ>&yFCFu#dUEpfug*wHO75kmmURI~ z;;}N8$`8}Qt5fWla%#^6EZ+O16SzCE4qoSiz+?Y+={48MCZ_TcQ#qn93 zTpyL(Y)*OjaNjmeBiHyk(1Kt%5_*#+8>v@cjPlBPVm+30GCtSOCj|K-z0yp9*E_S@?#^EQ{yNH&i;glIkQu z=m9}RC-7{x9glU+a}Xngi0054XYr*7+3`p*-tw%hti!&X&Q5j9`SCV9Gx5x}o#3qo zakp(_xgm{FVmb z@`iwr@IDExi19#yP26O-}p`H>edj`JYDT;aRk8N+KfuIn|K&tv!QX!a70nlhF` z(n=oIx-zu1I$g1h%4iP#636F1w7cXrtUOGZ|y~umnF`tvMnryj-{?ap_ z#Xh$JSO7)|i3H#Iwu||OFTs6O4J|eZ4s;gS_F2|9G>~@}*vK{A<(A6qm>@hpbHo&U zVb}abhbYAtLdK`IeIiz=it%@Kp1XFre(5xj^jcsuE9`j*4|f=TZIR&diTcLUGI%SC zs%`2qZrt45t-<81G*=sJ3oEUjl$naa<}-?xBDgF#;C*gXdre~bBiV#mqK_$mT*DRE zu7qSv=7~NF8oQ3qTwhz8ZL%6|jJM*DyY%tRt^Khak4Ki5mrtsy?sbF3PB7^@CT`i9 zrgCUM_5r-z2nVIw>$JwS@q!3urS^^4Cdpno&N5?1T|Afsp6R#llldL;jl5P4;N=Kr zKQ-`nJkd)Whb=+2Z{Mlh+}yKj?nfvj{Tz2DwO%fHbxU)=1MM+*KG|8x`il^s?uoiR zer;viXaq)dB!Tm}>*RhVg3HBDqtWU{y+sbm^L=gu`9hZzQ{UgZsOxc>bwdlb-t-tr zBslCv2x5N2XA@?xUcLJ28ojUiSaUM|xk6i=omi4ap6RpMf|P3wres(!=aGxqnkHXo zXAfc66^0kR#ZC?QBsBJK=?EF$JvdFYav7h_{;h=DWVZ=QR}SHWrGkUVqkR(eR)kf^FE%*jUXJpV9PL76t}CvDvr0 zpIVk9O(V~*-Pb^0hMWvf9E-m+HZ&^6p;PivD3dA>M^A6Sv4JlZxwW_pnMX#(R##STqsRe%CbFVJ z5~YX%q(L`su&Y?JWUL*L4XHlJruj@}w3MU7v|)e!))eGw(KPa^VtxfSJuTpR%SHp` z)zs9kCsn?B#e%WqSzg*$9&OLvC}UgyhF70UzR~x7RK?Mer%tNfG_Sa-JG~`@-tQbv zq=+)q92tr6@$5l&_)`k=)!DXHa&5=zbUqaJuvX|br^r#7qMUJQ$-U&k(1j>&<2R)3 z#eOmJOoQM(%FRA8hqdeuQ@YD_g6KRIdBaHvf|_H=93#7C9QHy8IM^7SQJ-es>Z~>T zyda93Z~v}mRvlp$?OD`1sfx5iklA_r_*~b0!rUmw->m#<;Zes#?W?OqE)h%$JW(ze z+w{4Tm@Ytok8~T;BHvvtC;{0c%cy8un?ae^kl;o`~# zjf{>GsgBwe_Vis?ixsp}6s44W-ba$?{q6b)?60T7O}_oUt2TWQc#f4bIq$!aN#4@Z zvgA2Gu7Y8c-T6jL@^_Ptu9r}~*i^Lk8{)jjoZvo`Kw)GuqUR}|m8)`ocePvt%)KWV z_>o6VQzGH!v5)r_@vJY;j!wW`s_7(sd&|MQPJjcL(m43Jzf3gZ?p^f}AC33wz4bxvLN>C7>rsd0E$=H<2k8_lU##$l9jdU{p00xT?>(Wu7_Aiuax>#f#*>?GiY? z9Dgl?cPe!VU%4{uooeFRkKC&30^m}2rmicA&1|12-Ee_1T9)ll_6!O)lF?Z^ z*0OuoF7}z4+>#jOeLF_Vj;OXTO+BBszO+71c?Xicw{e0^+-1ouJ1ID{)1E+(AZ(D_ zSV|5s9VquvY0t8%D{>kQv;X{#(F>{#Y6&0tcvw1J6p1_WI{ON`~By`1p(# z;|RIrNrIrfZ?R#k5b#=)u>NWAM*2+&;tN-USNgx*pr|MEAVQm!86= zsV_!g4qIm2sK*C0l`A}u=J6@U>=}3iXOEm~SFhf>kga(>ouOk+NE7m?tHVO>u*La@ zzC2?(#L61-1QNRQ&9o*b3FfBydPd|_XVh7z$pudmyyM%|_uQ?*?!e)W$iW;a#i2}s z{bK-Y-9Gj{Rdi?1Q-jLR%eeTt5M+iOot$>WE8^eS&;LM9@5+~fih+$DyNdJ63Yg!} zHTn1N-!H#;BeOHf-E|&vi~Zna%#aI%%%T;nBs;}S!(^8dEn97EZExjn$uC07{qDoN zbllyG=E0SE+uL)=LP{#){P}~bRNv_kiWseY%hMse;o!u0ppJ0M!Z$TGCeZVqx#|K= zXTRT&=-teVPXxa7J?~h648sY+(_JK#rdj4$jiZtrGzY<0_zw9NS7WxeE86kc6R`&5M(5R_8*SBLM8ZRap02PC(7|Om1MpY`WXjP zHJ67eDTEjX4*ii_Q^x7Whq4jRaBy(wDh@`j1csae#KHdQJj7h9?2Aw6_@NrAk$v23 z{$jbozhxM5*ItPI4I}Gi4`$%SJ9XU$cbs{7BP1kw2=>Tk1=!PBv#10yb;vkPP%X&N zzc#bD$PA&Gm7A=fXY%V*HrN_@dQ=P0n7YX;9hOJpBnh9c&8T5d49+>sb_;c zM(yOuZMe$b#l6qn>=3;_!fQd-rK%%AFU5U zB-^%alTlZvvgj`r?kjPzG99UliiUX=(N$Q5@R{wiGH0OYyKE8jEom!(9gi9!iJP zWlwhI94ga)x$XVh^6Y#RnH3#Tdx1J}A)qrKilp>Nx8H@*eR*!|eJ`X&PnH)4yLf8g zCIP6nDM5MN`Gj~@EAMZ$%~TgZa%K4820sBJ!c#|&M;BbZAyHljaoxP z;}tRsNb}y8&AdKPf+F{wh=|ILjPoI%okeaZBs3}|h;=zbd2iWdY$fs$LLerSEPdl! zFZ}zFico8^4XkH{iJU>_JIM zJpdroWA5y4h!ac|b^d%DoW`Dr+U=0rpM=nVCo-~XMr=1KBJOoWZ>-HKH7-}rL0x-I z@x+Oj;vyqHQ?MyGXPp{%EJOWpa_qnS9bAVw*+cNx(N;g-Y!!q<5oLg7_%h zg$OE;K;2DQaTwW{w|D9A`UiB$2)_@2KnI4`de{IR8LGY(eR^6w`YM#c?;2wHlW}oz z2^HQ~S?2E?8yh=$_Uz6@s0-{<^m?oY%Ej3WcIWj>+JF7yBTQ~UPq zM^4>R^;gfKsBJ;%E9A3lu+fjPuc6@2$avYJ^C@FWvw2cd5_UTxq8LCfA>XHC_pi|z za)99elwUTNpPQ}@DIdW-!byT)i*4Qxu<^xF_X7*-lI05IQ|>jxwn+1;keDU ztH0uf@L9--^9wj^jBd86`@SRJ`0`=!akzsLzP=k_v6X1b=kMS;derHwN`Cs+i~dEi z(Y0xzCw_yX;j;5oERtRB6%_R8{~*R^zdpzyz5|fAruW14?|}M?k1Q`k#<>oUZ628? zxuf|VoyUoQ(L=W8fK#d$65jd)#lK5)#9f6f@XYEZ*|N%%U%!vg-aVS*v>f^0@pfFM zGlaTDuhK63=lg@llIs8?XO~d@W%735C7=E8htY}rmPWc!jDHM^Ydz~J*8c>R09z!% z)>OS%AS*lctW{L|*AMNlC8p8dPw5~0^;uV+ubrA8VE^N$y<^O0&zPsX75)0IgSL`7 zQ~$YCY%o>szjsYt%X0Yd4P+(7yLaJ*9Qt)y+`E;+UHo4T$z=cJ5>&2GsxFP)vgJ~z z`E{vI9+T|r|MS~2W2sutU+O#jx_m_G>&{w&RBTXvf2Ui}LNVe?_O<-^?Kjm*bN_ja zqVEIOKgZ)ZOO}0rnBuoNzL}iJ(x+eN?`0_}AJ!_`-80Wk1vBde#;?8ZTzo+Ow7rt` zwc1;rXMjurKpzn4y`?wv5;=fKAfB3<+(upR(xkgR z10ID7Uh5Os^ejmkRW+ENf1HS(sk1>-JZ`q?sf+t&+3`7tx z9ufjz)4kKaC17YY#J7KYOXVwxwv+$8N#sy!kI2dTmkj9*^R7O?KCE=Y%G}>4iPPJ< zb#I%;|GqR)%F}Y=3q*{sCCyPv9#2}^YbG=trjfd zITimD-nl)k5j`0z-+u0avor7Gx0p8K@pPN>J{~_d0NBEqZD2k4LFd;M}hM3INT zzi~0Qvgk><_{iUfAc%(2BZElBKVC`tys)hu z0|Kck~UZ;`NWFvz0H}gyFrD_}5VnqKlNG6&>sPy%L68`Ch!7Lq(S|j}tcRTp| zoZlGSiJ$+Mu~(ia(frF8@$m3d{&F>L$gra*Td4k@Z~9ayfV2aqVEZ3dapQ9J9%_Eu zYghM#wmv$W{f~EtebP&%PGc4*w`Kc~Wc<5R&e;;PDOv;`-ldWvaNhFwDS9y!S^d>r zN-bR>O7qw4Qq28SXoOp=oAkWpx&PkmG;uipsiRRLh+>mqBm52WR7`3Z| z3xR2>amVt1pIm*1j5>R(zYn0zpeP$a%m2P7(CNJ`e;=9x)#twtpf&RH-`^&TmG~Kq zjQQYyMy73&#CIx6WY2$I)BmMCLQ}6p9R0;np#@+Il!M1Bp8C%;>+>A80275^{EJgU zv)oA>zQwx#=T>f9V%=LxfIla!xB9F47S;ZnzW~c{V6Hs0B`EkOAwaQF5Ram!Z>xAj zCh^C3mAHEU{t&Thd#%4dWae-s``;h(o_KCcrSPXw9NK}4HVSz9-*)GVA(`sqR)3un zRUYLnb;6%k9M(#F2i(YZNGg8Yq52LVU)ZP9Qb?0RUiEJ%K(Bs=BXmE^FTqI;CKg6~ zHpr~D_B4Fs6=t7ro9j+z6?BY}Eb=BU#jp2|teKVh z>x~X3^c;9lSH1nnN55)F^UltojT@#-6*bcfmiyoFr|oRA`RkK2zMZ8!|fMs_tm;BTfBhBJPTX7gXLR`Zr~8G(zk6 z;*&=fZM62!ocia2;R%G_w1oW|LfB@ow6t^+ShyNI$6BB)0jH=M7^sk^Qg~0gXV3l5 z(&U#fU#_aDx%OuM)Z+X+yW6HaPgpMAX%$jhT7}cn(j}8RzF-?32mNQBF$fGtUDR!k zp6}ATwBFVaoRtVra0#Frk>wB$x(7A5HW{$0pAgx#zWDB)@;H)GxB^gG0koRhbbnbF z(hXc851}dD(oCc(C4PdM-Z)AmI+qHH=GFj!DR&T2M0QF-VQu{8CZjcg^5$W~0f4{y zuMS?Lx4yz~JYK{l4FJ)cA+x-^ysJo1@-`d%P<65D7oUWAdqwKMZa*Y0t^;ZmO2FS`!|BA;XEx(^?=1ePOr{77PRz>uME$25 z@o1bMCMG6wsU72&&kF?ZI`A5Js6@c2?@WFjtXyDD^j2Mcb12-LfRS|X-jfJQ*DZCw z1@DPRzh}>hZ0+KfuWxyq%%2XWA*TGHEZItzSt9#>L0j!TH4a~2;?q-E#)h-zxL>*4 zz}k>zkHBS1%h6(UW5)|l9SKJ(*8n3!^1 zpX(rz3iE~+tjlKv-mwH<0Zg9z#sR@c4W@ba z+@>2X`Suq%kL|4hUQY|)q%Oo~!24MH`j$U6sgK_4@p;~}C0k372_9M3)I{lvL=~Q% zBD*p4=70lPg9gXt(_3mq(%_0jI`6M1y20LQB)mI09QW?sdl%Feg8&9!;q0WW*6{Q0LZ-pHPfV^UH?ZM z4B+q=uz}x$&}Ipg4wLXmZv=7!S)l>UA2BsgK$-i@!HyiGGawQWX?=6+5Wj_mg*W00 zW`=8uwF+%#0!XQV#`pw!k_7;EzhTv*weaLgkTaYF$T|ij1>J@@1VG_F)vNH0$H$P| zY84RX?$!B;n)ZzIL=vlCcr#z>Gpw)78%aq?)pq5X6(jxB{VNWV`y?^J{L0&8hrn6T z!58CVVvZg@e3)yxY%xK1t>?k%kU0=NnF6m_i?G;uUbC=953LiVN$@Orcsw=chon4+ z4<`Zf4h|LsxcKWE2U3r+u#nPueB6UXC@V-SBi2L&VkjQO5#nLyeI@*};aE#c2XY}`8^FX+@I1z#qPPky->3Wz-S^w}Q9cCW5_R`8i%MY9 z{gq^7^g*9tnPjma%=(NEAjg3Z9vo!kh$sc#|+x6eGgb(6x-Fhi# z-Fb6mX*gWYt3elLdb%r*`8_ZdnxRIY-o}Uo9^K$*H|P8M`heYM3|m`YuYGr4s;jhA zj3M9!cwcLRUAvB87?|Muwbf0v3m2ll_Bu6L0GlYg3p)<%iNp&oZNX@We z23V7g5B|G}nIdE{Og-N+icv%)b{lq=$0XQw?sIc&Ypa?B?5q7E&MZVxp`fbC0KLvz zkpC2YlW^Kt^OyqeVj&DcX2qkB`piOt=Sp|g=e}8}3GS7Jy%r7<3SCiMKo6iP@ z^MZ?51GuOA;9{J?{H`~fJAc9aUmo}N_CA~C;5OcReGCZ5+3AfW;P}#L1+4GlVGM^4 z2gt{ZoWBUbEbv6mU=Up({*VA!)5_=MaAM+0jB$H{=lIcvq3V!%ka(mzIy!C-H247A z10Nr(9V`{a=9j!CO91?a4!B&l62MD;U&@M3> zso^rtXJ#R4Rxv@W7VvV!6)d2!z*^RjVEQ@g`d}R0Kvz-X>`ROU*`SPpfx)2o1b^kV z-5qNSJ$AilDRHnjZ{B&^+36h+l{fCe+tJypNv^TME9TFxkfFE9UhRNmzwMw<&W!QWo zruG4(ow+6~~S!k<(ixJa`r~$9DX`j+@5tb`^87PtL1A?~C_MT*5VhY^PrH`#5 zrVDR3U6uzZVS<6f5b_(6YxpKc$7fC|YTGN64GIYGKH=F})Mc}P4EsqE<-zDn$N;=r z`&1<-aPc`92HVNM*_@B-(uQ{)1A+bU>s^RmECG`p$n*7*B$xE#0oBe`sJ2TdqgXGx z&p5JzJQKV}sPv)hH*Taji_q>-I^{Q1p9HDZ?ZiaRpitP0UBFg6NoCn7;x_d*lvcFB z9BeNTE@&yR(ei|_>YCgv1F}IGN5|aZm1T%?y<|#a_xA`Rwzlq=FNWQ^b*mN3hUU(` zqeqV(p=f~Y0a6tWvxeA|)tMT4AK#@x{0VTk^=v1R@~gW31#)7C4pnjwzXd;HUgAEa z4icboAVtEOx+h&xtfoA0K+dM~>B|zcCb}M^9^BeM29kGGnvGHL8 zsz3}g=i9%RocuJvx^9I>!J8eb1YF*ESqjzIIl26@|G z;v!cB@~%suHsU}eRafqjGW)@kA)qL9Prxthcc{h(LQJTsRp@bV=HaJZ)>ouwD_D1q z;;Mv>z=E#8nc5Y$z9xGtR-ay(lrg(PG-2+(tL-W4^D7MrgZYr z9HXj}#MqW%3exWz;11Q|1Z?gif*%L#2N&oA6rUt;^yfg!{1t=)(FC2goL z=>sB^B+`Z5zb5TUa@Vn~3fdD3R67ySpJGk3_Cr;Kt4SyP)w!>o@W(^?m^AzQ0Eji- z8$|hYFtZJ)dZ}(5B5{~x6&8-s0x=yw6VvMyvlozRo7#a{9Fnk82R(F##rsEd;Pt=w z`ud*AYa{_o*qs0s47N}2;08ntq=C5))q~pkgd5vg%DpEb z__H>uR=MOpe0cb=+jM_umo)`U#*Vx$HuHSVBA?X)dyq`tzxYI#?f49(^6J85{XK{3 z*RNHFcI`b$fXWI*IXTu@tw%5otw_>^0#JXM7wtgcP&pwq5QsHZg6?k;RZ6E}jUm5< zt0;@$vpkq*A#UzlqDrUTGJk}QOIB7^8^jsuA3o?0c|VS9#J6(K4eND!P^|T? zFEk?zN)7`^S|35J`x)$Md+Z}dLBWeuyryr(^D;mp-q#P265QeH7YqaERRCp=7N}ka zgv+A`d=_=;QK}OsXlDw-LSqvXLLy2Iw#D2x9@gE@YTJ>d2$HUEwe|I6z{A%>C2)s< zaJUDlp${GM2mNGH`(qugsadDoMbL7>@Arn$OEzjiLS+BJ&u97DNZ>@rlUXE}ugpZQ2m}CyPxLDK-A5Z~8O6op zDLZyM0qeh8a_!w(qv-VK_bn~kqfJhf#<7CsxpwMaT6gJ-vnwCFYl5m;$h6sXEG>^U zaS?-}`q5cE76`FV^KJWLL1G!g4I;a*pm~9kmjxxNCZK~Xfp(T=W{8pm1OyDA72Y(H z02jXw(lK5%WrCnKya09#Ydm$-GJw<_WFh<@v)1R~<=t`V(k0YlU;wuXy9@bhI*e%P zDVtnyaBu)BT}I!=oI9+$OK3U{4gZA$%|3E+LI6uzuk0X_$FS+r*|6ow!hv=W#rpH_ zzi}9p=8z`E=R31u7*dj%<){ZhY(D@4sV`fddj1J4$qUJ#k+I+ebDFKMue;QQ(-#t5 z!6-sbcRqJ}GKum;V^h;_kWL(lCOaDrJI5B{d3%c7o&6y0-43xF=?jFNJ|&6iX29=QQ zKskG40?xL5mxvA!;|-O5`UG(<>q6!SZwmlX&`!54B!bm;^ad}dPZb#CMqk~@5`54! zuWQB*@`cDYOL808ysu5XK7)wh_6VgNb0eT=cHT4xxEK>zKe4!s5eh;bbcIf;;&i7vS zwzX*?9F}roPM^YxIc`OjeNg5o6IUJwXkmIS<&4Tcka(&xMU2tyD$~^)5;CL0J9y|& zdR7+OeUSB#mN`o_?!v>(>6r{0KJRUN>yZVL>saM$8s>Fvhmk_#3b?h%jlJM74zsa^ zBB>B^SL?cK80pR=n&8C9pUm%fr1Ek@CSmgHb%#tvys!GF8v7@wW+55kD*yq|B&G zt4-tZH=qiFMLSy|%W%ghYO~rBs7fY(FtTgjH ztIY0e!drE5vd(iMD`N$4C=*nZHbA1Uonkif@GCFWc-D|ErXrXNHGqMfteWFI+mtbK z3uX{?7h1x(xruRMyXP3ZOFCfi!kI6 z#*kc(l+*D$eUgt~GQB1`*H=rhdv~g7 zNR*6Ec%SbYc?L0g?EO#7jsH22s8fa-?$r;DlXsI2wEfKqj8+ z*RNa4$Pl1_afOr}v2CC><0H)kAKTxB;J8|NK8tC`4h-dV+?cq2a-v%!`}?;2}y}Cu8*sdl;bs%Jbu`GwPtjHiZ5pQ&T3+@`>(J52q5@ z2&QLgM9RI(M}&m#K1@v|0w4pSwXsk+alsDJ)QrWH#gd`eV4e_jnu7MCIN0&fh;R}B z*SiR**)2Xtik`Os`nG%O&YI86Pax<+5ugLYqrNHGun5mOAKr%)&>0}5F(?7QN+;hU z26zZ&i}e60sj}e!6pN8%jw3rI;k^_XHhnN{WCno#UKhg6(s?dG&0`$&2ns3G+=sBU-A^Rk0Zzm?e7*NUSHTY^r z*r*4JF%W#-0Up>m)0%s)ky;*1@AkaiPMK^yYO_}Xgqmoo^1AdJ?+KSo^*!eu>cJo3 zJ}D(d8?Sn=25Qk~sL2TwcnF#n$r*?Rzqt&^1TjK7-1F3W2vs&j>+^t$EcRDt1lqbA|vc07g^-sVPNL(b3U* z&WbGZRk9Tjn``DXAIcTJJ~huky!eG>jO|P!v@}2kN&HHfvSnVE9p6a2&zHj9GAhX z?UO{DrAh2;Z2Mk^(?22i+5ytNoAIEL1=IwouqjVpIrrp*a6Io_F}G?p+Ys7x|7gvM zWA{Kz*)~IBZf?%9RTy2`^nKpRFq`?L+_99Ina6i+=1foI(R0rbzN7GE1FZeEdGmwQ z6n;bPilBluf*gtnwUgQbY+13s&|^Ad7cRbVSNexWd@Hhm>+W>6VLL)aLECNTSt$n646AV1k(b^yapo;;Zb^%MmK zz9|zVbFJC z05-Mg%q@HN><|LB&@UV+U+RL}a8fsvZzhEe8&ya#rkZf_Tqif^BO6VHN<4 zM1>q;$YdU5jkcSB<;Z>92d@W}LCPv1vsqw?1=p9Ws;h-Pm-8*#>SmS)E3f4t^*1EA z4OsOqL5a;Zr(t-tEXb(thyz$z>^Ksf52VFgxN;IQHe*z~yV*J%Np-@D7;U_3+y&hD zdWJoyMWGksmmCOmdK$pNN>dC`XE#~439%n?d@FL1~RP6+29uZ2Jsi=cc2h;D4G+L2&MS&t>3lzt0-3^)n&DAONfZw=Td zXeRFTDRh`;0oD7c+ykip*wLfcL&C#T!)ZmOckI}43$ka;eyBQd8MlKcskZJf)wm$J za<$gUO+FV`-hAKl!cF3f_rT2C=TN5?D9T6cCkQXLsn=OXpC!P7`Ww|SoH`|~Gp0To zyAEK%N{zWxz>vTLcZ^Q4KllV~AN;^3nS!wyp%}od5c|-@*2OqqGjpv48f5oG+GZMa zQ31r0)MA6$#*hXcfX5Ow$PG|{1uS*(s}sl4ra-j)n&?q-?Xi(-xg};HareYLS`fh9 zqN1YGiVO*Lq(DnTc7@X@Nn&K=$IoAMR%RYtI)JZs7czA(YqX~U%1}`lqqfsXPD>-G zI)ZUaLr(*EVrX44xP%1YC_p2_s{mr9$>H9+LOZ?aM;1i@t}Hh&WeSz%Ea60!5V5(u zQ=PbYjSP4r;4Fh-zwdw2W_f+-03}u}8A?V)rM}YZOq?)!Klk~Ip#mrw7l8fYWvjo^ z8It|LG~VO}SZoAz{9gtvq2-|e0~XMrKX~vU4Yj-?Btj#4M~<1E2f{x_vT+mOP3Zu0 ztgfzx<{)T2IJMU0SGUFnjuDL0E)m@C)Rt+-qP}5mcv&hqla^Uz4q!>L{Lg6yOWMDtGY**!SHW;emv zy4VAsB~x8hr3{mF=IUuPfFBp2u_!hX8Y&e~uR@;zdP@Ye4Bb%z6Q@cT9fay^4eA@{ zB*jBRsiqGXar_vB@R(Sje7Yeh0Wo;&e&_&gdfnIdA^Z<~xRD~}>GPTO29%$^n5e; zHT1}uYXKo*P<#7Gm_#r*%Yp*)<}3ZrEF!p3Q44uWzvl!yS&akqJJx~Czbc0ohhfm? zd)$zgs(Pgn!;Doom_R?y8+c@J|`-UL_da)dtTDOjvRP^vfHh40tE!T_bk zEBa(0TCg!uvdL$m%d8!0$a@j;e?4vKuS%j z3>K1$*X}hAXM6=Izjs3G3At>&b77F= zTn`Fj0Ixs^CFa-Z6lzk{UL{TdX?sgO&aq4sidOMwL4q;kS(eZ_>H5+%4~KC(Rp8O) zj@?O1EgX=8p;lKY3pw&AlRBN0-@feVC_JSk1Vt`N=pdZ}x=zG*_rol)tP55#;zT&X zJp*T;`wpgar^z}?A<&Xgv!WioHw_KhPw^kjq6!B1S~D6RW0@0U11_jH0^-j>w5jCu zd?C|02mK0FT}4pm3Wc#Y^FA$I2NwEzgQ?S8EoG)&4ibm1JShl{N+YeZ-72LIg z1mxw~o`rD|;rN>KBe!5&av*t8d?ZU7(zI@|;L{viLYhvobVElAytDu^ zy5Hm}aF^GIWu?@FW0+jnKtaR<0w2Tg$`V=Hh#C;()bgbp-O{9wxLmEW7dPY(C7ys1 z3Ae{H#*BON5h4_z52FS_&6avdfA-_vh?@O>{fZ*@`C{zYU_i~UIw7b}dkr1E{`&M< z?nh^dlJ+XP|E61d@u`-dsSqmH2n*F3P%kmzh9niVe|>~ehU&T6*jFjW zzloag1g3q1#uB#uWl9$113H{q&^BF1awpt4H_2+XF+2XEZHs*H;9pce zPdyg35c%p1ej=ORH=Fb&JEPU;qV{pc9h!#6sk;>=M^FSh#5`rQe@q@TQK_>3N%qjq-{)? z^)*(|VG7QWlGc$cpOvKK)XjopAe_~XE4_XIeX@wGH(B=+X56j|9bc2@l*Ch9+-MR$ z$Ta9v;h|Pl9~qe-+=DLiQ$uZ$gA3>di50Sr~#@;Y&KLH zAa2$xW2X@;22tU>UAMZwkgoU4X&ZZc`y0YHEfmH?I^W>q-0MP0Mpx3d_J?D?@ z#!z{Z0pbK}2!}2(ikjVaA;Jhvf)2B0D7aAP@@;5|zAMi}08t5*=a4NM0UijrZ%w!< z>eoh)Gk{Ts0HXz<@Qzx^s#VwIZlko_YjLUpoKOUi?+L>~=8$5GLtB{*bQPn*sljRSb)NvI(14J#aO$( zl4?qFavbb9zyfVRglN94Km`>n)LnpJW*RS5KsPfGr>As^>@SC0zkdIbe9VI*0ms2t zp(%3y(s>KS7g(S{5;$&aK;eo3(BRxCdOi!C(Iw7fuYlfonENy2a5Wo zF%LWwdh^L4v_StbL3496be-=@X|t?-aT!;`EU|h$xnly!vO0lj<_6$`#Pvtlr&fV= zElemnqGH?enccBSX#mjKL$nUCa&S-xzXT6YZk2<6UYDN%73yS$GJ)0rR2#8K)dSha zUZ`xxz}9=RGB|1-5$m>sNbAXkiqAiVo1=NEF`SYoJ~k<5~b+*F%6A(;@EPS+1Nv3!GgPNDW9C zn9dll0qtHI9=;peD2s=C>|tDA;9YDQ6X|)32}EH%+dDca1A(dJP=9(HAJKm3@EI;R zJE&cs>jj8y9y=u%90A=7BHCU8Qi&*hsMl|tc+x>OO0%Ee^3;y)+eyLp_JRn{0w~oV zBy8t1i*s=L;!QS<+$t_W#3_=N0@e`hAnrM*Z`tu!0a0vyD8&I7XFH~k$R!kT%mCbi z#&bS&stq(~BJ2VHO_(u8P$Gn_i<`csQb6f9=y#=E5l9{o6Z?Ol*FI}X&d&;y6bj=h)c#oyjy=Wv^uKnzY!=zPmhF$2$nz_ z6xR14l+J8Tv+qFcxbj{}k{_u6QL2fuIz&VfW5)pvNJm3QN5tsBo_>Rxg3<2>QEs{l zhyS3Xr%)4T$m%zA&~aHGb+oV<-iXBRTjnINzz4LHBxOBc#L}S?)XD zL%*RX!jnL9GmcA;_`ztFe-|Hg3f^5--;^g#vbq0$-)9iVB4h$ z05c=$ya<2*F!UXdX(8K_+C?W;^bQJ6l&Y?yG-JpWYTnWXl;6UkWKFJ^AJ_>s8OZ8j zriFKYc~Y@qd1Q$V7zQOlua;d|3b1l<*-D8Lp$r6E zAQ&QRnk9uN`hX@<8pEPZ3;^ud1)DEu!dh#-=58c@esV4gLHhlk}p?*2|z^EQbkcOgY6QamnABRSpx^sAF$ zFW`6u@QAN1a9#|R+Mo_x@Mg`2q(fQW0x1WQNyH1S!g*If#FPanY9xcqXbxiOd3QKK zqI_^2d1?1+awffE{)_kah&tW6`lAarO!TQ=j-+dskg!Fi@2d6+0_1fV`cs}^& zcUyrRDrMNKEKe*9*>E=|tM#sv~p`EXA;1Drmh#jfx=$xCAPta#%`vl%d_x^-O=WJPqC-9fw3r z@BQ_%2j~@Cfnv;c7?y^!erg<)SM(`dsN>I33#${HA?5F1v250}Z}d z(?If3l9^LF&&+RiEo*H8CV7M}zRZ5(-YlFo0D`VBkW=J~tjGDEYnF8ZplcQ3;K1D9 zm%8=^PB;`51e!Pl*2@{FV!i%u)iD)yb@eebc>kwtT85)gsF8NmV!<5*)ha7F^l{lm zVNovL1Xq+Fb-?i{&$>5tZiL7?B+iQI9js{4OEVc!)+{_$xlB~6G2o##(%Xg3`hy74 z4RJmLM)DR&{j>LQ&vN==LD2g_t$weL3enOEaE8~NsHkc^IKZe%MGcOl0R%n(P>`-% zP^H6u7j7qNf+CwAq=Xb5atOECI{IR%>MZPE1f&6RG7AC@Z)s^fz4okH5LdvgId1m= z4fSJ)I-yi1+H-cm7LXaF8y4a~fZ-ik89}Zz2M$FU9qoA~ysHl;5&or}PN9Y}q z0uS17UGU%+;F;Mlo1&| z<93L_yB{M^4JkMMhFk!!>gFB_T?B`F5>nk=%Gv}FM17k2n!bILh4F}h04~VN-jHz} z#B@dQMd4!>D0PFhRrlU}o3q*{D_>s;v}+C70EBql9Dxgl0LRC;1dRaxjeJoV9A(%I zM;V?dHE2Tu<*b@WZED91_C~SS%a^$Ps4CCpeCaRikua&-*9Xw6To(17lMJ9?5sZ<4 z1sZ%qkWAl1O1Qj01d0LVlV<}7?rVsh4uEk#daPYM#F7MRuE)zr698q+)nc#3$0)8S zzzH&G&bP!t$gqBuQuiHX(C_tp=A&HT`|W^*f9?Q)00eF$2-B)q{uIY_f>a*?TA(d) zKo<_ec#zOKNc{r{D}nmx;d7hPUPn3{Ks*sNAst4ep$BTEx~ys@3n6+ zZz&r9gT!aeOZsnXrRR_5((sxOtX9xN&!LbzpNp3X%Ng@BB7EpzvjAr5$iZ8>F9x zQC)|FG#}lYesoa)R@Y<#j%Lh*y*rF_I*LD?)VW+%sgE6&RHTDe1r6ZVAu|C=mz*Gi3=#bzC^8?|`Z2&wvtp%W> zcvV@M4wg3qr{P`5yb5vbJ>)vC{=c@)KNjjZjN>Z58)=eu$&ZnAIJ=6-&vAYnSGg$J ztRJ+-SIS+fs8z#IhT+mxNSR8)V$HQlb#*QsE9+#f)UHs`aM7q{dVdzp_s+k!?>(Q- zeLmms^L#(A=lwiKnzaxmWO1>|bBZXe5nJ-h{m)ju9{&04kVh6gprIXj9r6p^NJ_$6 zxcRa88OpktB8*{A1d#96A#26-<`3t=}RljAYDADfh~&k~)y z=ADAR`nxIwE<-!pK}C~`uAUwrWNT0sA%(kPLR6`K9*)R>UJ}o-Twd_3QbBpb3@SYU zbRD1^cS?RldXtL9tA?khVA+?9AN~+!-cBztq{uTU0e=*NQ zs_A#aJBZG!O~;Z5nD>F;)Mp)8!96< z2Gm%I=}avBD6hnWBco%O7P&)gP&6In)UvrsGYdM!p?I>VpH2ApJSp|lfjOjft9{~; zsypZQZmauKD&ZV7ib`O5`Ml9KFj)vFw!@T1$8JjT3+uy2@-E2u`8KRj?kw+N}Ab8BsmC)jG_9$09l#EU3-M zlIn)1lxYsyVmTS)4tx_hK0VoT_qakJKP&0^dhNdI%JDV5LP%Rg(lM1 zP^tcg9Y4-h68|}P0dR4KHs@p$T2;2ZBicdQbkSW z*OC4IxNt4IBX?Mh;>fqLL+3}VXXz`Wv{hoAqJ3%6pPBZamTz)_D3koV2sd~ery+1( F=3hSBgM9!1 literal 33083 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 M6)oj#CDR-K11;*)IRF3v From 689562e61b0816215d483dabf8d18a3c368ddd89 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Nov 2019 09:59:32 +0100 Subject: [PATCH 883/994] Add IsEnterpriseVersion flag CURA-6569 --- cura/ApplicationMetadata.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index daa937197c..024219e1f3 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -9,7 +9,11 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False -DEFAULT_CURA_SDK_VERSION = "7.0.0" + +# Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for +# example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the +# CuraVersion.py.in template. +CuraSDKVersion = "7.0.0" try: from cura.CuraVersion import CuraAppName # type: ignore @@ -32,6 +36,9 @@ try: except ImportError: CuraVersion = DEFAULT_CURA_VERSION # [CodeStyle: Reflecting imported value] +# CURA-6569 +# This string indicates what type of version it is. For example, "enterprise". By default it's empty which indicates +# a default/normal Cura build. try: from cura.CuraVersion import CuraBuildType # type: ignore except ImportError: @@ -42,7 +49,8 @@ try: except ImportError: CuraDebugMode = DEFAULT_CURA_DEBUG_MODE -# Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for -# example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the -# CuraVersion.py.in template. -CuraSDKVersion = "7.0.0" + +# CURA-6569 +# Various convenience flags indicating what kind of Cura build it is. +__ENTERPRISE_VERSION_TYPE = "enterprise" +IsEnterpriseVersion = CuraBuildType.lower() == __ENTERPRISE_VERSION_TYPE From 792c365e9e69032a6a41efa997ce395fff50cab8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Nov 2019 10:40:30 +0100 Subject: [PATCH 884/994] Remove hardcoded essentials CURA-6569 --- cura/ApplicationMetadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 7058a2f6cb..024219e1f3 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -7,7 +7,7 @@ DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" -DEFAULT_CURA_BUILD_TYPE = "essentials" +DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for From b843210fd37e25abb8ceb875c4a98567a2045f65 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Nov 2019 10:48:18 +0100 Subject: [PATCH 885/994] Add machine name to the machine settings dialog --- .../MachineSettingsAction.qml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index a1540c22ab..56b4d3e3b6 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -87,9 +87,25 @@ Cura.MachineAction } } } + + Label + { + id: machineNameLabel + anchors.top: parent.top + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + text: Cura.MachineManager.activeMachine.name + horizontalAlignment: Text.AlignHCenter + font: UM.Theme.getFont("large_bold") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + } + UM.TabRow { id: tabBar + anchors.top: machineNameLabel.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width Repeater { From 8baa009f1fab63f288c4dc77d3f76c7c4c1a71e7 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Nov 2019 10:53:49 +0100 Subject: [PATCH 886/994] Use IsEnterpriseVersion in Toolbox CURA-6569 --- plugins/Toolbox/src/Toolbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index a31b818b37..c8c809cc82 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -129,7 +129,7 @@ class Toolbox(QObject, Extension): def _restart(self): self._updateRequestHeader() # For an Essentials build, login is mandatory - if not self._application.getCuraAPI().account.isLoggedIn and ApplicationMetadata.CuraBuildType == "essentials": + if not self._application.getCuraAPI().account.isLoggedIn and ApplicationMetadata.IsEnterpriseVersion: self.setViewPage("welcome") else: self.setViewPage("loading") From 0ad5ce19da20468222099dcd7d9be0cddb6cc6c4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Nov 2019 12:49:09 +0100 Subject: [PATCH 887/994] Fix leapfrog profiles CURA-6951 --- .../definitions/leapfrog_bolt_pro.def.json | 1 - ...Leapfrog_Bolt_Pro_global_standard.inst.cfg | 4 +- ...ro_brass0.4_abs_natural_standard.inst.cfg} | 18 +-- ...o_nozzlex0.4_abs_natural_standard.inst.cfg | 107 ++++++++++++++++++ ...o_brass0.4_epla_natural_standard.inst.cfg} | 18 +-- ..._nozzlex0.4_epla_natural_standard.inst.cfg | 107 ++++++++++++++++++ ...ro_brass0.4_pva_natural_standard.inst.cfg} | 20 +--- ...o_nozzlex0.4_pva_natural_standard.inst.cfg | 104 +++++++++++++++++ .../Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg | 4 +- .../Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg | 4 +- 10 files changed, 335 insertions(+), 52 deletions(-) rename resources/quality/Leapfrog_Bolt_Pro/abs/{Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg => Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg} (97%) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg rename resources/quality/Leapfrog_Bolt_Pro/epla/{Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg => Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg} (96%) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg rename resources/quality/Leapfrog_Bolt_Pro/pva/{Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg => Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg} (96%) create mode 100644 resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index 09e3d77007..7f6e8ec2ec 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -13,7 +13,6 @@ "supports_usb_connection": false, "supports_network_connection": false, "has_materials": true, - "preferred_material": "leapfrog", "has_machine_quality": true, "has_variants": true, "preferred_variant_name": "Brass 0.4", diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg index 76008cc89b..b94b8ee547 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -4,11 +4,11 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard weight = 0 global_quality = True [values] -layer_height = 0.15 \ No newline at end of file +layer_height = 0.15 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg similarity index 97% rename from resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg rename to resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 1e8596d84b..15171b26b8 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -4,18 +4,18 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard -weight = 1 +weight = 0 material = leapfrog_abs_natural +variant = Brass 0.4 [values] layer_height_0 = 0.3 line_width = 0.4 initial_layer_line_width_factor = 120 - wall_thickness = 0.8 wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 @@ -30,9 +30,6 @@ z_seam_type = sharpest_corner z_seam_corner = hide_seam skin_outline_count = 1 - - - infill_sparse_density = 20 infill_pattern = grid connect_infill_polygons = True @@ -41,7 +38,6 @@ infill_wipe_dist = 0 infill_before_walls = True min_infill_area = 0 - retraction_enable = True retract_at_layer_change = False retraction_amount = 2 @@ -49,8 +45,6 @@ retraction_speed = 25 switch_extruder_retraction_amount = 15 switch_extruder_retraction_speeds = 20 - - speed_print = 35 speed_wall = 25 speed_wall_0 = 25 @@ -64,8 +58,6 @@ speed_slowdown_layers = 1 speed_equalize_flow_enabled = True speed_equalize_flow_max = 150 - - retraction_combing = all travel_avoid_other_parts = True travel_avoid_supports = True @@ -75,7 +67,6 @@ retraction_hop = 2 retraction_hop_after_extruder_switch = True retraction_hop_after_extruder_switch_height = 2 - cool_fan_enabled = True cool_fan_speed = 30 cool_fan_speed_min = 0 @@ -101,15 +92,12 @@ support_join_distance = 2 support_tower_diameter = 3 support_tower_roof_angle = 65 - - adhesion_type = brim brim_width = 8 brim_line_count = 14 brim_outside_only = True skirt_brim_minimal_length = 250 - prime_tower_enable = True prime_tower_size = 20 prime_tower_min_volume = 6 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg new file mode 100644 index 0000000000..8bc19aa8c0 --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -0,0 +1,107 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 10 +type = quality +quality_type = standard +weight = 0 +material = leapfrog_abs_natural +variant = NozzleX 0.4 + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + +speed_print = 35 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_min = 0 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_min_layer_time = 5 +cool_min_speed = 10 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + +adhesion_type = brim +brim_width = 8 +brim_line_count = 14 +brim_outside_only = True +skirt_brim_minimal_length = 250 + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg similarity index 96% rename from resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg rename to resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 85a4bc80c3..20642ff289 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -4,18 +4,18 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard -weight = 1 +weight = 0 material = leapfrog_epla_natural +variant = Brass 0.4 [values] layer_height_0 = 0.3 line_width = 0.4 initial_layer_line_width_factor = 120 - wall_thickness = 0.8 wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 @@ -30,9 +30,6 @@ z_seam_type = sharpest_corner z_seam_corner = hide_seam skin_outline_count = 1 - - - infill_sparse_density = 20 infill_pattern = grid connect_infill_polygons = True @@ -41,7 +38,6 @@ infill_wipe_dist = 0 infill_before_walls = True min_infill_area = 0 - retraction_enable = True retract_at_layer_change = False retraction_amount = 2 @@ -49,8 +45,6 @@ retraction_speed = 25 switch_extruder_retraction_amount = 15 switch_extruder_retraction_speeds = 20 - - speed_print = 50 speed_wall = 25 speed_wall_0 = 25 @@ -74,7 +68,6 @@ retraction_hop = 2 retraction_hop_after_extruder_switch = True retraction_hop_after_extruder_switch_height = 2 - cool_fan_enabled = True cool_fan_speed = 100 cool_fan_speed_min = 100 @@ -100,18 +93,15 @@ support_join_distance = 2 support_tower_diameter = 3 support_tower_roof_angle = 65 - - adhesion_type = skirt skirt_line_count = 3 skirt_gap = 1 skirt_brim_minimal_length = 250 - prime_tower_enable = True prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg new file mode 100644 index 0000000000..d68c3ade1a --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -0,0 +1,107 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 10 +type = quality +quality_type = standard +weight = 0 +material = leapfrog_epla_natural +variant = NozzleX 0.4 + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + +speed_print = 50 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 50 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 +acceleration_enabled = False + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg similarity index 96% rename from resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg rename to resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 08dd3579e2..8540b72c2f 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -4,18 +4,18 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = quality quality_type = standard -weight = 1 +weight = 0 material = leapfrog_pva_natural +variant = Brass 0.4 [values] layer_height_0 = 0.3 line_width = 0.4 initial_layer_line_width_factor = 120 - wall_thickness = 0.8 wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 @@ -30,9 +30,6 @@ z_seam_type = sharpest_corner z_seam_corner = hide_seam skin_outline_count = 1 - - - infill_sparse_density = 20 infill_pattern = grid connect_infill_polygons = True @@ -41,7 +38,6 @@ infill_wipe_dist = 0 infill_before_walls = True min_infill_area = 0 - retraction_enable = True retract_at_layer_change = False retraction_amount = 2 @@ -49,8 +45,6 @@ retraction_speed = 25 switch_extruder_retraction_amount = 15 switch_extruder_retraction_speeds = 20 - - speed_print = 50 speed_wall = 20 speed_wall_0 = 20 @@ -69,11 +63,8 @@ travel_avoid_other_parts = True travel_avoid_supports = True retraction_hop_enabled = False - - retraction_hop_after_extruder_switch_height = 2 - cool_fan_enabled = True cool_fan_speed = 100 cool_fan_speed_min = 100 @@ -99,18 +90,15 @@ support_join_distance = 2 support_tower_diameter = 3 support_tower_roof_angle = 65 - - adhesion_type = skirt skirt_line_count = 3 skirt_gap = 1 skirt_brim_minimal_length = 250 - prime_tower_enable = True prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True \ No newline at end of file +prime_tower_brim_enable = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg new file mode 100644 index 0000000000..d79cfa51fa --- /dev/null +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -0,0 +1,104 @@ +[general] +version = 4 +name = Standard +definition = leapfrog_bolt_pro + +[metadata] +setting_version = 10 +type = quality +quality_type = standard +weight = 0 +material = leapfrog_pva_natural +variant = NozzleX 0.4 + +[values] +layer_height_0 = 0.3 +line_width = 0.4 +initial_layer_line_width_factor = 120 + +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +top_bottom_thickness = 0.8 +top_bottom_pattern = lines +optimize_wall_printing_order = True +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +z_seam_type = sharpest_corner +z_seam_corner = hide_seam +skin_outline_count = 1 + +infill_sparse_density = 20 +infill_pattern = grid +connect_infill_polygons = True +infill_overlap = 0 +infill_wipe_dist = 0 +infill_before_walls = True +min_infill_area = 0 + +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_speed = 25 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 + +speed_print = 50 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +speed_topbottom = 25 +speed_travel = 200 +speed_layer_0 = 25 +speed_support = 40 +speed_travel_layer_0 = 45 +speed_slowdown_layers = 1 +speed_equalize_flow_enabled = True +speed_equalize_flow_max = 150 + +retraction_combing = all +travel_avoid_other_parts = True +travel_avoid_supports = True +retraction_hop_enabled = False + +retraction_hop_after_extruder_switch_height = 2 + +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 5 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 4 +cool_min_layer_time = 5 +cool_min_speed = 5 + +support_interface_enable = False +support_angle = 50 +support_pattern = zigzag +support_connect_zigzags = False +support_infill_rate = 20 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_join_distance = 2 +support_tower_diameter = 3 +support_tower_roof_angle = 65 + +adhesion_type = skirt +skirt_line_count = 3 +skirt_gap = 1 +skirt_brim_minimal_length = 250 + +prime_tower_enable = True +prime_tower_size = 20 +prime_tower_min_volume = 6 +prime_tower_position_x = 169 +prime_tower_position_y = 25 +prime_tower_wipe_enabled = True +prime_tower_brim_enable = True diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg index 7beb6d44aa..ee8b832034 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg @@ -4,9 +4,9 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg index c4a3caf61d..6f0adfb5e1 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg @@ -4,9 +4,9 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 9 +setting_version = 10 type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 From 870db0641bdb89c3efd06f58c761454d1c31419d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Nov 2019 13:11:49 +0100 Subject: [PATCH 888/994] Ensure that machines with 1.75mm filament select the right preferred material CURA-6950 --- cura/Machines/VariantNode.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index 8275c70e62..b2115ca099 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -85,11 +85,20 @@ class VariantNode(ContainerNode): for base_material, material_node in self.materials.items(): if self.machine.preferred_material == base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node - # First fallback: Choose any material with matching diameter. + + # First fallback: Check if we should be checking for the 175 variant. + if approximate_diameter == 2: + preferred_material = self.machine.preferred_material + "_175" + for base_material, material_node in self.materials.items(): + if preferred_material == base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): + return material_node + + # Second fallback: Choose any material with matching diameter. for material_node in self.materials.values(): if material_node.getMetaDataEntry("approximate_diameter") and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): Logger.log("w", "Could not find preferred material %s, falling back to whatever works", self.machine.preferred_material) return material_node + fallback = next(iter(self.materials.values())) # Should only happen with empty material node. Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format( preferred_material = self.machine.preferred_material, From d87d38ceed5224357084be93b5aa8e796487cdf6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 5 Nov 2019 13:18:34 +0100 Subject: [PATCH 889/994] Update translation template files for 4.4 Contributes to issue CURA-6957. --- resources/i18n/cura.pot | 1075 +++++++++++------------ resources/i18n/fdmextruder.def.json.pot | 2 +- resources/i18n/fdmprinter.def.json.pot | 149 ++-- 3 files changed, 606 insertions(+), 620 deletions(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 4281c42eb8..40a0c03721 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "" @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -74,16 +74,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "" - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -127,21 +117,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -213,9 +188,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "" @@ -245,8 +220,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "" @@ -278,17 +253,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "" @@ -303,6 +278,23 @@ msgctxt "@info:title" msgid "Print error" msgstr "" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "" +"New printers have been found connected to your account, you can find them in " +"your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -513,7 +505,7 @@ msgid "GIF Image" msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" msgstr "" @@ -618,12 +610,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "" @@ -634,13 +626,13 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" @@ -649,7 +641,7 @@ msgid "" "instead." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "" @@ -731,16 +723,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -761,7 +743,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -777,19 +758,24 @@ msgctxt "@info:title" msgid "Login failed" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "" @@ -797,36 +783,45 @@ msgid "" "overwrite it?" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "" "Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" "Failed to export profile to {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "" @@ -834,44 +829,44 @@ msgid "" "failure." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "" "Can't import profile from {0} before a printer is added." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "" @@ -879,41 +874,41 @@ msgid "" "import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -979,14 +974,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "" @@ -1000,9 +994,9 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "" @@ -1017,39 +1011,90 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "" +"The visual profile is designed to print visual prototypes and models with " +"the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "" +"The engineering profile is designed to print functional prototypes and end-" +"use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "" +"The draft profile is designed to print initial prototypes and concept " +"validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" +msgid "Custom Material" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" msgstr "" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 @@ -1063,17 +1108,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "" @@ -1111,11 +1145,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "" -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1301,22 +1330,27 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "" "@info 'width', 'depth' and 'height' are variable names that must NOT be " @@ -1324,41 +1358,41 @@ msgctxt "" msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1367,57 +1401,57 @@ msgctxt "@label" msgid "mm" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "" @@ -1427,22 +1461,22 @@ msgctxt "@label" msgid "Y max" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -1522,7 +1556,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1716,11 +1750,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1991,9 +2020,9 @@ msgid "Edit" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "" @@ -2016,61 +2045,61 @@ msgctxt "@label" msgid "Type" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2125,17 +2154,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "" @@ -2493,70 +2522,69 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "" @@ -2583,6 +2611,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2596,7 +2629,7 @@ msgid "Printer Group" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "" @@ -2607,75 +2640,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "" @@ -2788,54 +2827,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2927,174 +2918,180 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "" "The new filament diameter is set to %1 mm, which is not compatible with the " "current extruder. Do you wish to continue?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "" "Could not import material %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "" "Failed to export material to %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "" @@ -3109,27 +3106,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "" @@ -3140,241 +3137,251 @@ msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "" "You will need to restart the application for these changes to have effect." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "" "Highlight unsupported areas of the model in red. Without support these areas " "will not print properly." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "" "Moves the camera so the model is in the center of the view when a model is " "selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "" "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "" "Should models on the platform be moved so that they no longer intersect?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " +msgid "Camera rendering:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "" "An model may appear extremely small if its unit is for example in meters " "rather than millimeters. Should these models be scaled up?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "" "Should a prefix based on the printer name be added to the print job name " "automatically?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "" "When you have made changes to a profile and switched to a different one, a " @@ -3382,50 +3389,51 @@ msgid "" "not, or you can choose a default behaviour and never show that dialog again." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "" "Default behavior for changed setting values when switching to a different " "profile: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -3433,33 +3441,16 @@ msgid "" "stored." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3467,95 +3458,86 @@ msgid "Printers" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "" "This profile uses the defaults specified by the printer, so it has no " "settings/overrides in the list below." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "" @@ -3622,35 +3604,35 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" +msgid "Search settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3682,19 +3664,19 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "" "This setting is always shared between all extruders. Changing it here will " "change the value for all extruders." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3702,7 +3684,7 @@ msgid "" "Click to restore the value of the profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value " @@ -3711,6 +3693,19 @@ msgid "" "Click to restore the calculated value." msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "" +"@label %1 is filled in with the type of a profile. %2 is filled with a list " +"of numbers (eg '1' or '1, 2')" +msgid "" +"There is no %1 profile for the configuration in extruder %2. The default " +"intent will be used instead" +msgid_plural "" +"There is no %1 profile for the configurations in extruders %2. The default " +"intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3756,32 +3751,13 @@ msgid "" "your object which is easy to cut off afterwards." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "" "You have modified some profile settings. If you want to change these go to " "custom mode." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "" -"This quality profile is not available for your current material and nozzle " -"configuration. Please change these to enable this quality profile." -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "" -"A custom profile is currently active. To enable the quality slider, choose a " -"default quality profile in Custom tab" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3792,12 +3768,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the " @@ -3806,6 +3787,11 @@ msgid "" "Click to open the profile manager." msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3945,11 +3931,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3985,16 +3976,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -4074,12 +4055,12 @@ msgctxt "@header" msgid "Configurations" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "" @@ -4110,12 +4091,12 @@ msgctxt "@label" msgid "Enabled" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "" @@ -4531,34 +4512,34 @@ msgctxt "@title:tab" msgid "Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "" "We have found one or more G-Code files within the files you have selected. " @@ -4566,12 +4547,12 @@ msgid "" "file, please just select only one." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -4640,139 +4621,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -4795,32 +4776,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "" @@ -5003,12 +4979,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "" @@ -5065,6 +5041,31 @@ msgctxt "@button" msgid "Get started" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "" @@ -5129,16 +5130,6 @@ msgctxt "name" msgid "Model Checker" msgstr "" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "" - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5149,16 +5140,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "" - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5361,6 +5342,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5561,18 +5552,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "" -"Allows material manufacturers to create new material and quality profiles " -"using a drop-in UI." -msgstr "" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot index 66f0c71ccc..322be35b57 100644 --- a/resources/i18n/fdmextruder.def.json.pot +++ b/resources/i18n/fdmextruder.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 5e386628a0..89ff364e2d 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -1121,6 +1121,18 @@ msgid "" "value is rounded to a whole number." msgstr "" +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "" +"The number of initial bottom layers, from the build-plate upwards. When " +"calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -4567,7 +4579,7 @@ msgstr "" msgctxt "minimum_interface_area description" msgid "" "Minimum area size for support interface polygons. Polygons which have an " -"area smaller than this value will not be generated." +"area smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -4579,7 +4591,7 @@ msgstr "" msgctxt "minimum_roof_area description" msgid "" "Minimum area size for the roofs of the support. Polygons which have an area " -"smaller than this value will not be generated." +"smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -4591,7 +4603,7 @@ msgstr "" msgctxt "minimum_bottom_area description" msgid "" "Minimum area size for the floors of the support. Polygons which have an area " -"smaller than this value will not be generated." +"smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -5518,6 +5530,49 @@ msgid "" "setting is set to Exclusive or Middle." msgstr "" +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "" +"The minimum size of a line segment after slicing. If you increase this, the " +"mesh will have a lower resolution. This may allow the printer to keep up " +"with the speed it has to process g-code and will increase slice speed by " +"removing details of the mesh that it can't process anyway." +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "" +"The minimum size of a travel line segment after slicing. If you increase " +"this, the travel moves will have less smooth corners. This may allow the " +"printer to keep up with the speed it has to process g-code, but it may cause " +"model avoidance to become less accurate." +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "" +"The maximum deviation allowed when reducing the resolution for the Maximum " +"Resolution setting. If you increase this, the print will be less accurate, " +"but the g-code will be smaller. Maximum Deviation is a limit for Maximum " +"Resolution, so if the two conflict the Maximum Deviation will always be held " +"true." +msgstr "" + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5982,49 +6037,6 @@ msgid "" "and very tiny 3D models with a lot of details." msgstr "" -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "" -"The minimum size of a line segment after slicing. If you increase this, the " -"mesh will have a lower resolution. This may allow the printer to keep up " -"with the speed it has to process g-code and will increase slice speed by " -"removing details of the mesh that it can't process anyway." -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "" -"The minimum size of a travel line segment after slicing. If you increase " -"this, the travel moves will have less smooth corners. This may allow the " -"printer to keep up with the speed it has to process g-code, but it may cause " -"model avoidance to become less accurate." -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "" -"The maximum deviation allowed when reducing the resolution for the Maximum " -"Resolution setting. If you increase this, the print will be less accurate, " -"but the g-code will be smaller. Maximum Deviation is a limit for Maximum " -"Resolution, so if the two conflict the Maximum Deviation will always be held " -"true." -msgstr "" - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -6195,19 +6207,6 @@ msgid "" "coasting move the pressure in the bowden tube drops." msgstr "" -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "" -"Alternate the direction in which the top/bottom layers are printed. Normally " -"they are printed diagonally only. This setting adds the X-only and Y-only " -"directions." -msgstr "" - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -6419,22 +6418,27 @@ msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" +msgid "Flow Rate Compensation Max Extrusion Offset" msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." +msgid "" +"The maximum distance in mm to move the filament to compensate for changes in " +"flow rate." msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" +msgid "Flow Rate Compensation Factor" msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." +msgid "" +"How far to move the filament in order to compensate for changes in flow " +"rate, as a percentage of how far the filament would move in one second of " +"extrusion." msgstr "" #: fdmprinter.def.json @@ -6786,14 +6790,15 @@ msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" +msgid "Adaptive Layers Topography Size" msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "" -"Threshold whether to use a smaller layer or not. This number is compared to " -"the tan of the steepest slope in a layer." +"Target horizontal distance between two adjacent layers. Reducing this " +"setting causes thinner layers to be used to bring the edges of the layers " +"closer together." msgstr "" #: fdmprinter.def.json @@ -6805,7 +6810,9 @@ msgstr "" msgctxt "wall_overhang_angle description" msgid "" "Walls that overhang more than this angle will be printed using overhanging " -"wall settings. When the value is 90, no walls will be treated as overhanging." +"wall settings. When the value is 90, no walls will be treated as " +"overhanging. Overhang that gets supported by support will not be treated as " +"overhang either." msgstr "" #: fdmprinter.def.json @@ -7238,19 +7245,19 @@ msgstr "" msgctxt "small_feature_speed_factor description" msgid "" "Small features will be printed at this percentage of their normal print " -"speed. Slower printing can help with adhestion and accuracy." +"speed. Slower printing can help with adhesion and accuracy." msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" +msgid "Small Feature Initial Layer Speed" msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "" "Small features on the first layer will be printed at this percentage of " -"their normal print speed. Slower printing can help with adhestion and " +"their normal print speed. Slower printing can help with adhesion and " "accuracy." msgstr "" From b4974dc794bbc5f32bc2c6d1e0c8bc064b950023 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 5 Nov 2019 13:22:58 +0100 Subject: [PATCH 890/994] Update translation files with the template. part of CURA-6957 --- resources/i18n/de_DE/cura.po | 1224 ++++++++++-------- resources/i18n/de_DE/fdmextruder.def.json.po | 4 +- resources/i18n/de_DE/fdmprinter.def.json.po | 225 ++-- resources/i18n/es_ES/cura.po | 1221 +++++++++-------- resources/i18n/es_ES/fdmextruder.def.json.po | 4 +- resources/i18n/es_ES/fdmprinter.def.json.po | 221 ++-- resources/i18n/fi_FI/cura.po | 1107 ++++++++-------- resources/i18n/fi_FI/fdmextruder.def.json.po | 4 +- resources/i18n/fi_FI/fdmprinter.def.json.po | 118 +- resources/i18n/fr_FR/cura.po | 1221 +++++++++-------- resources/i18n/fr_FR/fdmextruder.def.json.po | 4 +- resources/i18n/fr_FR/fdmprinter.def.json.po | 225 ++-- resources/i18n/it_IT/cura.po | 1221 +++++++++-------- resources/i18n/it_IT/fdmextruder.def.json.po | 4 +- resources/i18n/it_IT/fdmprinter.def.json.po | 226 ++-- resources/i18n/ja_JP/cura.po | 1220 +++++++++-------- resources/i18n/ja_JP/fdmextruder.def.json.po | 4 +- resources/i18n/ja_JP/fdmprinter.def.json.po | 196 ++- resources/i18n/ko_KR/cura.po | 1220 +++++++++-------- resources/i18n/ko_KR/fdmextruder.def.json.po | 4 +- resources/i18n/ko_KR/fdmprinter.def.json.po | 205 +-- resources/i18n/nl_NL/cura.po | 1221 +++++++++-------- resources/i18n/nl_NL/fdmextruder.def.json.po | 4 +- resources/i18n/nl_NL/fdmprinter.def.json.po | 222 ++-- resources/i18n/pl_PL/cura.po | 1221 +++++++++-------- resources/i18n/pl_PL/fdmextruder.def.json.po | 4 +- resources/i18n/pl_PL/fdmprinter.def.json.po | 196 ++- resources/i18n/zh_CN/cura.po | 1220 +++++++++-------- resources/i18n/zh_CN/fdmextruder.def.json.po | 4 +- resources/i18n/zh_CN/fdmprinter.def.json.po | 196 ++- 30 files changed, 7873 insertions(+), 6293 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index e01c04a2f2..8b564fef55 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: German , German \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Geräteeinstellungen" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-Code-Datei" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter unterstützt keinen Nicht-Textmodus." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Vor dem Exportieren bitte G-Code vorbereiten." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3D-Modell-Assistent" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware aktualisieren" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Einstellungen Glätten aktiv" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Das Profil wurde geglättet und aktiviert." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Druck in Bearbeitung" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Schreibt X3g in Dateien" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g-Datei" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-Datei" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Konnte nicht auf dem Wechseldatenträger gespeichert werden {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Fehler" @@ -243,8 +218,8 @@ msgstr "Wechseldatenträger auswerfen {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Warnhinweis" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Anschluss über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Drucken über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Drücken über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Über Netzwerk verbunden" @@ -301,12 +276,26 @@ msgctxt "@info:title" msgid "Print error" msgstr "Druckfehler" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" msgid "You are attempting to connect to {0} but it is not the host of a group. You can visit the web page to configure it as a group host." -msgstr "Sie versuchen, sich mit {0} zu verbinden, aber dieser Drucker ist nicht der Host, der die Gruppe verwaltet. Besuchen Sie die Website, um den Drucker als" -" Host der Gruppe zu konfigurieren." +msgstr "Sie versuchen, sich mit {0} zu verbinden, aber dieser Drucker ist nicht der Host, der die Gruppe verwaltet. Besuchen Sie die Website, um den Drucker als Host der Gruppe zu konfigurieren." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:30 msgctxt "@info:title" @@ -502,9 +491,9 @@ msgid "GIF Image" msgstr "GIF-Bilddatei" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Öffnen Sie das komprimierte Dreiecksnetz" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -595,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Pro Objekteinstellungen konfigurieren" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Empfohlen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Benutzerdefiniert" @@ -611,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-Datei" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Düse" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projektdatei {0} enthält einen unbekannten Maschinentyp {1}. Importieren der Maschine ist nicht möglich. Stattdessen werden die Modelle importiert." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Projektdatei öffnen" @@ -703,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-Profil" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profilassistent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profilassistent" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -733,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Vorschau" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -749,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Login fehlgeschlagen" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Nicht unterstützt" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Datei bereits vorhanden" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Die Datei {0} ist bereits vorhanden. Soll die Datei wirklich überschrieben werden?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ungültige Datei-URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Die Einstellungen wurden an die aktuell verfügbaren Extruder angepasst:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Einstellungen aktualisiert" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder deaktiviert" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Unbekannt" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Export des Profils nach {0} fehlgeschlagen: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Export des Profils nach {0} fehlgeschlagen: Fehlermeldung von Writer-Plugin." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil wurde nach {0} exportiert" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Export erfolgreich ausgeführt" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Import des Profils aus Datei {0}: {1} fehlgeschlagen" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Import des Profils aus Datei {0} kann erst durchgeführt werden, wenn ein Drucker hinzugefügt wurde." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Kein benutzerdefiniertes Profil für das Importieren in Datei {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Dieses Profil {0} enthält falsche Daten, Importieren nicht möglich." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil erfolgreich importiert {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Datei {0} enthält kein gültiges Profil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} hat einen unbekannten Dateityp oder ist beschädigt." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Benutzerdefiniertes Profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Für das Profil fehlt eine Qualitätsangabe." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -942,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Sonstige" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Vorgeschnittene Datei {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Weiter" @@ -963,9 +954,9 @@ msgstr "Gruppe #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Schließen" @@ -980,40 +971,85 @@ msgstr "Hinzufügen" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Abbrechen" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Nicht überschrieben" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Benutzerdefinierte Profile" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Alle unterstützten Typen ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Unbekannt" +msgid "Custom Material" +msgstr "Benutzerdefiniertes Material" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Benutzerdefiniert" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1025,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Verfügbare vernetzte Drucker" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Benutzerdefiniertes Material" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Benutzerdefiniert" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1071,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Der Ultimaker-Konto-Server konnte nicht erreicht werden." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Erneut versuchen" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1260,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Bericht senden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Geräte werden geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Die Szene wird eingerichtet..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Die Benutzeroberfläche wird geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Es kann nur jeweils ein G-Code gleichzeitig geladen werden. Wichtige {0} werden übersprungen." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Wenn G-Code geladen wird, kann keine weitere Datei geöffnet werden. Wichtige {0} werden übersprungen." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Das gewählte Modell war zu klein zum Laden." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Druckereinstellungen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Breite)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1324,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Tiefe)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Höhe)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Druckbettform" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Ausgang in Mitte" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Heizbares Bett" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Druckraum aufgeheizt" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "G-Code-Variante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Druckkopfeinstellungen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X max." @@ -1384,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y max." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Brückenhöhe" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Anzahl Extruder" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Ende G-Code" @@ -1478,7 +1503,7 @@ msgstr "Plugins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1673,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Gerät" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print Core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1933,9 +1953,9 @@ msgid "Edit" msgstr "Bearbeiten" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Entfernen" @@ -1956,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Typ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Firmware-Version" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Adresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Dieser Drucker ist nicht eingerichtet um eine Gruppe von Druckern anzusteuern." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Dieser Drucker steuert eine Gruppe von %1 Druckern an." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Der Drucker unter dieser Adresse hat nicht reagiert." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Verbinden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ungültige IP-Adresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Bitte eine gültige IP-Adresse eingeben." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Druckeradresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Geben Sie die IP-Adresse Ihres Druckers in das Netzwerk ein." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2065,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Fertigstellung %1 auf %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Drucken" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Drucken über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Drucken" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Druckerauswahl" @@ -2425,72 +2445,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Glättung" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Mesh-Typ" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Normales Modell" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Als Stützstruktur drucken" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Keine Überlappung mit anderen Modellen unterstützen" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Einstellungen für Überlappung mit anderen Modellen bearbeiten" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Einstellungen für Füllung von anderen Modellen bearbeiten" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Einstellungen wählen" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Einstellungen für die benutzerdefinierte Anpassung dieses Modells wählen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtern..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Alle anzeigen" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Mesh-Typ" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Normales Modell" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Als Stützstruktur drucken" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Einstellungen wählen" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Projekt öffnen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Vorhandenes aktualisieren" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Neu erstellen" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2534,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Aktualisierung" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Neu erstellen" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2552,7 @@ msgid "Printer Group" msgstr "Druckergruppe" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profileinstellungen" @@ -2539,75 +2563,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Wie soll der Konflikt im Profil gelöst werden?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Name" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Nicht im Profil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 überschreiben" msgstr[1] "%1 überschreibt" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Ableitung von" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 überschreiben" msgstr[1] "%1, %2 überschreibt" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Materialeinstellungen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Wie soll der Konflikt im Material gelöst werden?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Sichtbarkeit einstellen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modus" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Sichtbare Einstellungen:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 von %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Das Laden eines Projekts entfernt alle Modelle von der Druckplatte." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Öffnen" @@ -2714,54 +2744,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "An jedem Tag, an dem Cura gestartet wird, ein automatisches Backup erstellen." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Nicht unterstützt" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Zurück" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Export" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Tipp" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Generisch" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Druckexperiment" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Checkliste" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Wählen Sie bitte alle durchgeführten Upgrades für diesen Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson-Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2829,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Soll das Drucken wirklich abgebrochen werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Änderung Durchmesser bestätigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Der neue Filament-Durchmesser wurde auf %1 mm eingestellt, was nicht kompatibel mit dem aktuellen Extruder ist. Möchten Sie fortfahren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Namen anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marke" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Materialtyp" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Farbe" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Eigenschaften" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Dichte" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Durchmesser" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Filamentkosten" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Filamentgewicht" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Filamentlänge" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Kosten pro Meter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Dieses Material ist mit %1 verknüpft und teilt sich damit einige seiner Eigenschaften." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Material trennen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Beschreibung" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Haftungsinformationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Druckeinstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Aktivieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Import" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Export" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Drucker" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Entfernen bestätigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Möchten Sie %1 wirklich entfernen? Dies kann nicht rückgängig gemacht werden!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Material importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Material konnte nicht importiert werden %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material wurde erfolgreich importiert %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Material exportieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exportieren des Materials nach %1: %2 schlug fehl" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material erfolgreich nach %1 exportiert" @@ -3025,27 +3013,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Alle prüfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Berechnet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Einstellung" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Aktuell" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Einheit" @@ -3056,307 +3044,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Allgemein" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Schnittstelle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Sprache:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Währung:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Die Anwendung muss neu gestartet werden, um die Änderungen zu übernehmen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Bei Änderung der Einstellungen automatisch schneiden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch schneiden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Viewport-Verhalten" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Nicht gestützte Bereiche des Modells in rot hervorheben. Ohne Support werden diese Bereiche nicht korrekt gedruckt." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Überhang anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bewegt die Kamera, bis sich das Modell im Mittelpunkt der Ansicht befindet, wenn ein Modell ausgewählt wurde" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Zentrieren Sie die Kamera, wenn das Element ausgewählt wurde" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Soll das standardmäßige Zoom-Verhalten von Cura umgekehrt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kehren Sie die Richtung des Kamera-Zooms um." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Soll das Zoomen in Richtung der Maus erfolgen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Das Zoomen in Richtung der Maus wird in der orthografischen Perspektive nicht unterstützt." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "In Mausrichtung zoomen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Sollen Modelle auf der Plattform so verschoben werden, dass sie sich nicht länger überschneiden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Stellen Sie sicher, dass die Modelle getrennt gehalten werden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Sollen Modelle auf der Plattform so nach unten verschoben werden, dass sie die Druckplatte berühren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Setzt Modelle automatisch auf der Druckplatte ab" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Warnmeldung im G-Code-Reader anzeigen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Warnmeldung in G-Code-Reader" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Soll die Schicht in den Kompatibilitätsmodus gezwungen werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Schichtenansicht Kompatibilitätsmodus erzwingen (Neustart erforderlich)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Welches Kamera-Rendering sollte verwendet werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Kamera-Rendering: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Ansicht" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Orthogonal" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Dateien öffnen und speichern" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Sollen Modelle an das Erstellungsvolumen angepasst werden, wenn sie zu groß sind?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Große Modelle anpassen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Ein Modell kann extrem klein erscheinen, wenn seine Maßeinheit z. B. in Metern anstelle von Millimetern angegeben ist. Sollen diese Modelle hoch skaliert werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extrem kleine Modelle skalieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Sollten Modelle gewählt werden, nachdem sie geladen wurden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modelle wählen, nachdem sie geladen wurden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Soll ein Präfix anhand des Druckernamens automatisch zum Namen des Druckauftrags hinzugefügt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Geräte-Präfix zu Auftragsnamen hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Soll beim Speichern einer Projektdatei eine Zusammenfassung angezeigt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialog Zusammenfassung beim Speichern eines Projekts anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standardverhalten beim Öffnen einer Projektdatei" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standardverhalten beim Öffnen einer Projektdatei: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Immer als Projekt öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Modelle immer importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wenn Sie Änderungen für ein Profil vorgenommen haben und zu einem anderen Profil gewechselt sind, wird ein Dialog angezeigt, der hinterfragt, ob Sie Ihre Änderungen beibehalten möchten oder nicht; optional können Sie ein Standardverhalten wählen, sodass dieser Dialog nicht erneut angezeigt wird." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standardverhalten für geänderte Einstellungswerte beim Wechsel zu einem anderen Profil: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Geänderte Einstellungen immer verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Geänderte Einstellungen immer auf neues Profil übertragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privatsphäre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Soll Cura bei Programmstart nach Updates suchen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bei Start nach Updates suchen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Sollen anonyme Daten über Ihren Druck an Ultimaker gesendet werden? Beachten Sie, dass keine Modelle, IP-Adressen oder andere personenbezogene Daten gesendet oder gespeichert werden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonyme) Druckinformationen senden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Mehr Informationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimentell" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Mehrfach-Druckplattenfunktion verwenden" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Mehrfach-Druckplattenfunktion verwenden (Neustart erforderlich)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3346,84 @@ msgid "Printers" msgstr "Drucker" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Umbenennen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Profil erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geben Sie bitte einen Namen für dieses Profil an." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profil duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profil umbenennen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Profil importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Profil exportieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drucker: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Standardprofile" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Benutzerdefinierte Profile" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Aktuelle Änderungen verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dieses Profil verwendet die vom Drucker festgelegten Standardeinstellungen, deshalb sind in der folgenden Liste keine Einstellungen/Überschreibungen enthalten." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ihre aktuellen Einstellungen stimmen mit dem gewählten Profil überein." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Globale Einstellungen" @@ -3515,35 +3488,35 @@ msgstr "Unbenannt" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "Einstellungen durchsuchen" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Werte für alle Extruder kopieren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle geänderten Werte für alle Extruder kopieren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Diese Einstellung weiterhin anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3548,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Wird beeinflusst von" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Diese Einstellung wird stets zwischen allen Extrudern geteilt. Eine Änderung ändert den Wert für alle Extruder." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Der Wert wird von Pro-Extruder-Werten gelöst " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3569,7 @@ msgstr "" "\n" "Klicken Sie, um den Wert des Profils wiederherzustellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3580,13 @@ msgstr "" "\n" "Klicken Sie, um den berechneten Wert wiederherzustellen." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3627,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Drucken eines Brim- oder Raft-Elements aktivieren. Es wird ein flacher Bereich rund um oder unter Ihrem Objekt hinzugefügt, das im Anschluss leicht abgeschnitten werden kann." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Schichtdicke" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Sie haben einige Profileinstellungen geändert. Wenn Sie diese ändern möchten, wechseln Sie in den Modus „Benutzerdefiniert“." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Dieses Qualitätsprofil ist für Ihr aktuelles Material und Ihre derzeitige Düsenkonfiguration nicht verfügbar. Bitte ändern Sie diese, um das Qualitätsprofil zu aktivieren." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Ein benutzerdefiniertes Profil ist derzeit aktiv. Wählen Sie ein voreingestelltes Qualitätsprofil aus der Registerkarte „Benutzerdefiniert“, um den Schieberegler für Qualität zu aktivieren" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3642,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Aus" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimentell" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3663,11 @@ msgstr "" "\n" "Klicken Sie, um den Profilmanager zu öffnen." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3795,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoriten" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Generisch" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3840,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder deaktivieren" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Druckplatte" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3919,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Konfigurationen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Konfiguration wählen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Konfigurationen" @@ -3984,12 +3954,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Aktiviert" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Für diese Materialkombination Kleber für eine bessere Haftung verwenden." @@ -4406,44 +4376,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Einstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura wird geschlossen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Möchten Sie Cura wirklich beenden?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Datei(en) öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Paket installieren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Datei(en) öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Es wurden eine oder mehrere G-Code-Datei(en) innerhalb der von Ihnen gewählten Dateien gefunden. Sie können nur eine G-Code-Datei auf einmal öffnen. Wenn Sie eine G-Code-Datei öffnen möchten wählen Sie bitte nur eine Datei." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Drucker hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Neuheiten" @@ -4514,17 +4484,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Über Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "Version: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Komplettlösung für den 3D-Druck mit geschmolzenem Filament." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4503,122 @@ msgstr "" "Cura wurde von Ultimaker B.V. in Zusammenarbeit mit der Community entwickelt.\n" "Cura verwendet mit Stolz die folgenden Open Source-Projekte:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafische Benutzerschnittstelle" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Anwendungsrahmenwerk" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-Code-Generator" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Bibliothek Interprozess-Kommunikation" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Programmiersprache" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI-Rahmenwerk" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI-Rahmenwerk Einbindungen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ Einbindungsbibliothek" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Format Datenaustausch" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Support-Bibliothek für wissenschaftliche Berechnung" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Support-Bibliothek für schnelleres Rechnen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Support-Bibliothek für die Handhabung von STL-Dateien" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Support-Bibliothek für die Handhabung von ebenen Objekten" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Support-Bibliothek für die Handhabung von dreieckigen Netzen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Support-Bibliothek für die Analyse von komplexen Netzwerken" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Support-Bibliothek für die Handhabung von 3MF-Dateien" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Support-Bibliothek für Datei-Metadaten und Streaming" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Bibliothek für serielle Kommunikation" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bibliothek für ZeroConf-Erkennung" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliothek für Polygon-Beschneidung" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Bibliothek für Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Schriftart" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG-Symbole" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Distributionsunabhängiges Format für Linux-Anwendungen" @@ -4668,32 +4638,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projekt speichern" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Druckplatte" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Projektzusammenfassung beim Speichern nicht erneut anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Speichern" @@ -4869,12 +4834,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Störungen beheben" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Druckername" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Weisen Sie Ihrem Drucker bitte einen Namen zu" @@ -4933,6 +4898,31 @@ msgctxt "@button" msgid "Get started" msgstr "Erste Schritte" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4983,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Modell-Prüfer" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Die Inhalte aller Einstellungen in eine HTML-Datei ausgeben." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Gott-Modus" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4993,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Firmware-Aktualisierungsfunktion" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Erstellt eine geglättete Qualität, verändert das Profil." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Profilglättfunktion" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5193,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Upgrade von Version 3.3 auf 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5403,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-Profil-Writer" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Ermöglichen Sie Materialherstellern die Erstellung neuer Material- und Qualitätsprofile, indem Sie eine Drop-In-Benutzerschnittstelle verwenden." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Druckprofil-Assistent" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5443,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-Profil-Reader" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Einstellungen Glätten aktiv" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Das Profil wurde geglättet und aktiviert." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Schreibt X3g in Dateien" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g-Datei" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G-Datei" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Öffnen Sie das komprimierte Dreiecksnetz" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profilassistent" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profilassistent" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Erneut versuchen" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print Core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Keine Überlappung mit anderen Modellen unterstützen" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Einstellungen für Überlappung mit anderen Modellen bearbeiten" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Einstellungen für Füllung von anderen Modellen bearbeiten" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Vorhandenes aktualisieren" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Nicht unterstützt" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Zurück" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Tipp" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Druckexperiment" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Checkliste" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Wählen Sie bitte alle durchgeführten Upgrades für diesen Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson-Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Kamera-Rendering: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Mehrfach-Druckplattenfunktion verwenden" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Mehrfach-Druckplattenfunktion verwenden (Neustart erforderlich)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Standardprofile" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "Einstellungen durchsuchen" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Schichtdicke" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Dieses Qualitätsprofil ist für Ihr aktuelles Material und Ihre derzeitige Düsenkonfiguration nicht verfügbar. Bitte ändern Sie diese, um das Qualitätsprofil zu aktivieren." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Ein benutzerdefiniertes Profil ist derzeit aktiv. Wählen Sie ein voreingestelltes Qualitätsprofil aus der Registerkarte „Benutzerdefiniert“, um den Schieberegler für Qualität zu aktivieren" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Druckplatte" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Druckplatte" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Die Inhalte aller Einstellungen in eine HTML-Datei ausgeben." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Gott-Modus" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Erstellt eine geglättete Qualität, verändert das Profil." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Profilglättfunktion" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Ermöglichen Sie Materialherstellern die Erstellung neuer Material- und Qualitätsprofile, indem Sie eine Drop-In-Benutzerschnittstelle verwenden." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Druckprofil-Assistent" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Über Netzwerk verbunden." diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index be1234cf71..cc76886efc 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: German\n" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 18172c1779..a4709dff1e 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: German , German \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Die Anzahl der unteren Schichten. Wenn diese anhand der unteren Dicke berechnet wird, wird der Wert auf eine ganze Zahl auf- oder abgerundet." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,8 +1433,7 @@ msgstr "Glätten aktivieren" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Gehen Sie ein weiteres Mal über die Oberfläche, aber extrudieren Sie diesmal sehr wenig Material. Dadurch wird die oberste Kunststoffschicht geschmolzen" -" und es entsteht eine glattere Oberfläche. Der Druck in der Düsenkammer bleibt weiterhin hoch, so dass Risse in der Oberfläche mit Material gefüllt werden." +msgstr "Gehen Sie ein weiteres Mal über die Oberfläche, aber extrudieren Sie diesmal sehr wenig Material. Dadurch wird die oberste Kunststoffschicht geschmolzen und es entsteht eine glattere Oberfläche. Der Druck in der Düsenkammer bleibt weiterhin hoch, so dass Risse in der Oberfläche mit Material gefüllt werden." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1709,8 +1718,7 @@ msgstr "Füllstart randomisieren" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "Randomisieren Sie, welche Fülllinie zuerst gedruckt wird. So wird vermieden, dass ein Segment am stärksten ist. Allerdings muss dafür eine zusätzliche" -" Bewegung ausgeführt werden." +msgstr "Randomisieren Sie, welche Fülllinie zuerst gedruckt wird. So wird vermieden, dass ein Segment am stärksten ist. Allerdings muss dafür eine zusätzliche Bewegung ausgeführt werden." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -3569,9 +3577,7 @@ msgstr "Unterstützung Linienrichtung Füllung" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet." -" Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste" -" ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass der Standardwinkel von 0 Grad zu verwenden ist." +msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet. Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass der Standardwinkel von 0 Grad zu verwenden ist." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3985,8 +3991,8 @@ msgstr "Mindestbereich Stützstruktur-Schnittstelle" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Mindestflächenbreite für Stützstruktur-Schnittstellen-Polygone. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3995,8 +4001,8 @@ msgstr "Mindestbereich Stützstrukturdach" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Mindestflächenbreite für die Dächer der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4005,8 +4011,8 @@ msgstr "Mindestbereich Stützstrukturboden" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Mindestflächenbreite für die Böden der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4046,10 +4052,7 @@ msgstr "Richtungen der Verbindungslinien unterstützen" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet." -" Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste" -" ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad," -" falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." +msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet. Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad, falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4059,10 +4062,7 @@ msgstr "Richtungen der Dachlinien unterstützen" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet." -" Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste" -" ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad," -" falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." +msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet. Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad, falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4072,10 +4072,7 @@ msgstr "Richtungen der Bodenlinien unterstützen" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet." -" Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste" -" ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad," -" falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." +msgstr "Liste der zu verwendenden Linienrichtungen (in ganzen Zahlen). Die Elemente der Liste werden während des Aufbaus der Schichten der Reihe nach abgearbeitet. Wenn das Ende der Liste erreicht wird, wird wieder beim ersten Element begonnen. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (zwischen 45 und 135- rad, falls die Verbindungsstellen ziemlich dick sind, oder 90 Grad) zu verwenden sind." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4801,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Entfernen Sie die leeren Schichten unter der ersten gedruckten Schicht, sofern vorhanden. Die Deaktivierung dieser Einstellung kann zu leeren ersten Schichten führen, wenn die Einstellung der Slicing-Toleranz auf Exklusiv oder Mittel gesetzt wurde." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Maximale Auflösung" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Die Mindestgröße eines Linienabschnitts nach dem Slicen. Wenn Sie diesen Wert erhöhen, führt dies zu einer niedrigeren Auslösung des Mesh. Damit kann der Drucker die erforderliche Geschwindigkeit für die Verarbeitung des G-Codes beibehalten; außerdem wird die Slice-Geschwindigkeit erhöht, indem Details des Mesh entfernt werden, die ohnehin nicht verarbeitet werden können." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Maximale Bewegungsauflösung" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Die maximale Größe eines Bewegungsliniensegments nach dem Slicen. Wenn Sie diesen Wert erhöhen, weisen die Fahrtbewegungen weniger glatte Kanten aus. Das ermöglicht dem Drucker, die für die Verarbeitung eines G-Codes erforderliche Geschwindigkeit aufrechtzuerhalten, allerdings kann das Modell damit auch weniger akkurat werden." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Maximale Abweichung" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "Die maximal zulässige Abweichung bei Reduzierung der maximalen Auflösung. Wenn Sie diesen Wert erhöhen, wird der Druck ungenauer, der G-Code wird jedoch kleiner. Die maximale Abweichung ist eine Grenze für die maximale Auflösung. Wenn die beiden Werte sich widersprechen, wird stets die maximale Abweichung eingehalten." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5176,38 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polygone in geschnittenen Schichten, die einen Umfang unter diesem Wert haben, werden ausgefiltert. Niedrigere Werte führen zu einem Mesh mit höherer Auflösung zulasten der Slicing-Zeit. Dies gilt in erster Linie für SLA-Drucker mit höherer Auflösung und sehr kleine 3D-Modelle mit zahlreichen Details." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Maximale Auflösung" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Die Mindestgröße eines Linienabschnitts nach dem Slicen. Wenn Sie diesen Wert erhöhen, führt dies zu einer niedrigeren Auslösung des Mesh. Damit kann der Drucker die erforderliche Geschwindigkeit für die Verarbeitung des G-Codes beibehalten; außerdem wird die Slice-Geschwindigkeit erhöht, indem Details des Mesh entfernt werden, die ohnehin nicht verarbeitet werden können." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Maximale Bewegungsauflösung" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Die maximale Größe eines Bewegungsliniensegments nach dem Slicen. Wenn Sie diesen Wert erhöhen, weisen die Fahrtbewegungen weniger glatte Kanten aus. Das ermöglicht dem Drucker, die für die Verarbeitung eines G-Codes erforderliche Geschwindigkeit aufrechtzuerhalten, allerdings kann das Modell damit auch weniger akkurat werden." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Maximale Abweichung" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "Die maximal zulässige Abweichung bei Reduzierung der maximalen Auflösung. Wenn Sie diesen Wert erhöhen, wird der Druck ungenauer, der G-Code wird jedoch" -" kleiner. Die maximale Abweichung ist eine Grenze für die maximale Auflösung. Wenn die beiden Werte sich widersprechen, wird stets die maximale Abweichung" -" eingehalten." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5348,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Die Geschwindigkeit, mit der die Bewegung während des Coasting erfolgt, in Relation zur Geschwindigkeit des Extrusionswegs. Ein Wert leicht unter 100 % wird empfohlen, da während der Coasting-Bewegung der Druck in den Bowden-Röhren abfällt." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Wechselnde Rotation der Außenhaut" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Die Richtung, in welcher die oberen/unteren Schichten gedruckt werden, wird abgewechselt. Normalerweise werden diese nur diagonal gedruckt. Diese Einstellung fügt die Nur-X- und Nur-Y-Richtung zu." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5530,23 +5515,23 @@ msgstr "Der durchschnittliche Abstand zwischen den willkürlich auf jedes Linien #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Ausgleich Durchflussrate max. Extrusionswirkung" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Die maximale Distanz in mm für den Ausgleich." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Ausgleichsfaktor Durchflussrate" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Der Multiplikationsfaktor für die Übersetzung Durchflussrate -> Distanz." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5839,13 +5824,13 @@ msgstr "Der Höhenunterscheid der nächsten Schichthöhe im Vergleich zur vorher #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Schwellenwert Anpassschichten" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Das ist der Schwellenwert, der definiert, ob eine kleinere Schicht verwendet wird oder nicht. Dieser Wert wird mit dem der stärksten Neigung in einer Schicht verglichen." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5854,8 +5839,8 @@ msgstr "Winkel für überhängende Wände" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Wände, die über diesen Winkel hinaus hängen, werden mithilfe der Einstellungen für Winkel für überhängende Wände gedruckt. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6234,20 +6219,18 @@ msgstr "Detailgeschwindigkeit" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Bei kleinen Details wird die Geschwindigkeit auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere Druckgeschwindigkeit" -" kann die Haftung und die Genauigkeit verbessert werden." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Geschwindigkeit für erste Schicht" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Bei kleinen Details wird die Geschwindigkeit bei der ersten Schicht auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere" -" Druckgeschwindigkeit kann die Haftung und die Genauigkeit verbessert werden." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6309,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angewandt wird." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Mindestflächenbreite für Stützstruktur-Schnittstellen-Polygone. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Mindestflächenbreite für die Dächer der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Mindestflächenbreite für die Böden der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden nicht generiert." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Wechselnde Rotation der Außenhaut" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Die Richtung, in welcher die oberen/unteren Schichten gedruckt werden, wird abgewechselt. Normalerweise werden diese nur diagonal gedruckt. Diese Einstellung fügt die Nur-X- und Nur-Y-Richtung zu." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Ausgleich Durchflussrate max. Extrusionswirkung" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Die maximale Distanz in mm für den Ausgleich." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Ausgleichsfaktor Durchflussrate" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Der Multiplikationsfaktor für die Übersetzung Durchflussrate -> Distanz." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Schwellenwert Anpassschichten" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Das ist der Schwellenwert, der definiert, ob eine kleinere Schicht verwendet wird oder nicht. Dieser Wert wird mit dem der stärksten Neigung in einer Schicht verglichen." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Wände, die über diesen Winkel hinaus hängen, werden mithilfe der Einstellungen für Winkel für überhängende Wände gedruckt. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Bei kleinen Details wird die Geschwindigkeit auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere Druckgeschwindigkeit kann die Haftung und die Genauigkeit verbessert werden." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Geschwindigkeit für erste Schicht" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Bei kleinen Details wird die Geschwindigkeit bei der ersten Schicht auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere Druckgeschwindigkeit kann die Haftung und die Genauigkeit verbessert werden." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Gehen Sie ein weiteres Mal über die Oberfläche, jedoch ohne Extrusionsmaterial. Damit wird der Kunststoff auf der Oberfläche weiter geschmolzen, was zu einer glatteren Oberfläche führt." diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 44487032d0..122197a1b7 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Spanish , Spanish \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Ajustes de la máquina" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Archivo GCode" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter no es compatible con el modo sin texto." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Prepare el Gcode antes de la exportación." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Asistente del modelo 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Actualizar firmware" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Aplanar ajustes activos" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "El perfil se ha aplanado y activado." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Impresión en curso" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Escribe X3g en archivos" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Archivo X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Archivo X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "No se pudo guardar en unidad extraíble {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Error" @@ -243,8 +218,8 @@ msgstr "Expulsar dispositivo extraíble {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Advertencia" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprime a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado a través de la red" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Error de impresión" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "Imagen GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configurar ajustes por modelo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Archivo 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Tobera" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "El archivo del proyecto {0} contiene un tipo de máquina desconocida {1}. No se puede importar la máquina, en su lugar, se importarán los modelos." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir archivo de proyecto" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil de cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Asistente del perfil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Asistente del perfil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Vista previa" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Fallo de inicio de sesión" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "No compatible" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "El archivo ya existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "El archivo {0} ya existe. ¿Está seguro de que desea sobrescribirlo?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL del archivo no válida:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "La configuración se ha cambiado para que coincida con los extrusores disponibles en este momento:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes actualizados" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusores deshabilitados" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Desconocido" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Error al exportar el perfil a {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Error al exportar el perfil a {0}: Error en el complemento de escritura." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado a {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportación correcta" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Error al importar el perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "No se puede importar el perfil de {0} antes de añadir una impresora." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "No hay ningún perfil personalizado para importar en el archivo {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Error al importar el perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Este perfil {0} contiene datos incorrectos, no se han podido importar." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Error al importar el perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado correctamente" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "El archivo {0} no contiene ningún perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "El perfil {0} tiene un tipo de archivo desconocido o está corrupto." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Al perfil le falta un tipo de calidad." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Otro" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Archivo {0} presegmentado" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Siguiente" @@ -962,9 +954,9 @@ msgstr "N.º de grupo {group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Cerrar" @@ -979,40 +971,85 @@ msgstr "Agregar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "No reemplazado" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Perfiles personalizados" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Todos los tipos compatibles ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Desconocido" +msgid "Custom Material" +msgstr "Material personalizado" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personalizado" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Impresoras en red disponibles" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Material personalizado" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personalizado" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "No se puede acceder al servidor de cuentas de Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Volver a intentar" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar informe" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Cargando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando escena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Cargando interfaz..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Solo se puede cargar un archivo GCode a la vez. Se omitió la importación de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "No se puede abrir ningún archivo si se está cargando un archivo GCode. Se omitió la importación de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "No se puede cargar el modelo seleccionado, es demasiado pequeño." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Ajustes de la impresora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (anchura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (profundidad)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forma de la placa de impresión" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origen en el centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Plataforma calentada" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volumen de impresión calentado" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Tipo de GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ajustes del cabezal de impresión" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X máx." @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Altura del puente" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Iniciar GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Finalizar GCode" @@ -1477,7 +1503,7 @@ msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Máquina" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Eliminar" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Versión de firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Dirección" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impresora no está configurada para alojar un grupo de impresoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impresora aloja un grupo de %1 impresoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "La impresora todavía no ha respondido en esta dirección." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Dirección IP no válida" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Introduzca una dirección IP válida." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Dirección de la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Introduzca la dirección IP de la impresora en la red." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina el %1 a las %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Imprimir" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Imprimir a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Imprimir" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Selección de la impresora" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavizado" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Tipo de malla" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modelo normal" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Imprimir como soporte" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "No crear soporte en otros modelos (por superposición)" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modificar ajustes de otros modelos (por superposición)" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modificar ajustes del relleno de otros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Seleccionar ajustes" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleccionar ajustes o personalizar este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar todo" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Tipo de malla" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modelo normal" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Imprimir como soporte" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Seleccionar ajustes" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir proyecto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Actualizar existente" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Crear nuevo" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Actualizar" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Crear nuevo" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "Grupo de impresoras" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes del perfil" @@ -2539,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "¿Cómo debería solucionarse el conflicto en el perfil?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nombre" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "No está en el perfil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 sobrescrito" msgstr[1] "%1 sobrescritos" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 sobrescrito" msgstr[1] "%1, %2 sobrescritos" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Ajustes del material" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "¿Cómo debería solucionarse el conflicto en el material?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidad de los ajustes" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Ajustes visibles:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de un total de %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Si carga un proyecto, se borrarán todos los modelos de la placa de impresión." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Crea una copia de seguridad de forma automática cada día que inicia Cura." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "No compatible" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Consejo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Ensayo de impresión" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificación" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Seleccione cualquier actualización de este Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Bloque Olsson" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "¿Está seguro de que desea cancelar la impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Información" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar cambio de diámetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "El nuevo diámetro del filamento está ajustado en %1 mm y no es compatible con el extrusor actual. ¿Desea continuar?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Mostrar nombre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Tipo de material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Color" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Propiedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densidad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diámetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Coste del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Anchura del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Longitud del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Coste por metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está vinculado a %1 y comparte alguna de sus propiedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Desvincular material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Descripción" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Información sobre adherencia" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Crear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Impresora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar eliminación" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "¿Seguro que desea eliminar %1? ¡Esta acción no se puede deshacer!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "No se pudo importar el material en %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "El material se ha importado correctamente en %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Se ha producido un error al exportar el material a %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "El material se ha exportado correctamente a %1" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Comprobar todo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calculado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Actual" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unidad" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "General" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interfaz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Moneda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Tendrá que reiniciar la aplicación para que estos cambios tengan efecto." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Segmentar automáticamente al cambiar los ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Segmentar automáticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamiento de la ventanilla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Resaltar en rojo las áreas del modelo sin soporte. Sin soporte, estas áreas no se imprimirán correctamente." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar voladizos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Mueve la cámara de manera que el modelo se encuentre en el centro de la vista cuando se selecciona un modelo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar cámara cuando se selecciona elemento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "¿Se debería invertir el comportamiento predeterminado del zoom de cura?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Invertir la dirección del zoom de la cámara." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "¿Debería moverse el zoom en la dirección del ratón?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Hacer zoom en la dirección del ratón no es compatible con la perspectiva ortográfica." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Hacer zoom en la dirección del ratón" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "¿Deben moverse los modelos en la plataforma de modo que no se crucen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Asegúrese de que los modelos están separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "¿Deben moverse los modelos del área de impresión de modo que no toquen la placa de impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Arrastrar modelos a la placa de impresión de forma automática" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Se muestra el mensaje de advertencia en el lector de GCode." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensaje de advertencia en el lector de GCode" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "¿Debe forzarse el modo de compatibilidad de la capa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzar modo de compatibilidad de la vista de capas (necesario reiniciar)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "¿Qué tipo de renderizado de cámara debería usarse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Renderizado de cámara: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspectiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortográfica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir y guardar archivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "¿Deben ajustarse los modelos al volumen de impresión si son demasiado grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Escalar modelos de gran tamaño" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modelo puede mostrarse demasiado pequeño si su unidad son metros en lugar de milímetros, por ejemplo. ¿Deben escalarse estos modelos?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Escalar modelos demasiado pequeños" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "¿Se deberían seleccionar los modelos después de haberse cargado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Seleccionar modelos al abrirlos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "¿Debe añadirse automáticamente un prefijo basado en el nombre de la impresora al nombre del trabajo de impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Agregar prefijo de la máquina al nombre del trabajo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "¿Mostrar un resumen al guardar un archivo de proyecto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar un cuadro de diálogo de resumen al guardar el proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamiento predeterminado al abrir un archivo del proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamiento predeterminado al abrir un archivo del proyecto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir siempre como un proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar modelos siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Si ha realizado cambios en un perfil y, a continuación, ha cambiado a otro, aparecerá un cuadro de diálogo que le preguntará si desea guardar o descartar los cambios. También puede elegir el comportamiento predeterminado, así ese cuadro de diálogo no volverá a aparecer." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamiento predeterminado para los valores modificados al cambiar a otro perfil: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar siempre los ajustes modificados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir siempre los ajustes modificados al nuevo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacidad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "¿Debe Cura buscar actualizaciones cuando se abre el programa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Buscar actualizaciones al iniciar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "¿Deben enviarse datos anónimos sobre la impresión a Ultimaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información de identificación personal." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar información (anónima) de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Más información" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimental" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Utilizar funcionalidad de placa de impresión múltiple" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Utilizar funcionalidad de placa de impresión múltiple (reinicio requerido)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "Impresoras" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Cambiar nombre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Crear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplicado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Crear perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Introduzca un nombre para este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Cambiar nombre de perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impresora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Perfiles predeterminados" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Perfiles personalizados" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Actualizar perfil con ajustes o sobrescrituras actuales" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar cambios actuales" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza los ajustes predeterminados especificados por la impresora, por eso no aparece ningún ajuste o sobrescritura en la lista que se ve a continuación." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Los ajustes actuales coinciden con el perfil seleccionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globales" @@ -3515,35 +3489,35 @@ msgstr "Sin título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "buscar ajustes" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor en todos los extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos los valores cambiados en todos los extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "No mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afectado por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Este ajuste siempre se comparte entre extrusores. Si lo modifica, modificará el valor de todos los extrusores." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "El valor se resuelve según los valores de los extrusores. " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3570,7 @@ msgstr "" "\n" "Haga clic para restaurar el valor del perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3581,13 @@ msgstr "" "\n" "Haga clic para restaurar el valor calculado." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Habilita la impresión de un borde o una balsa. Esta opción agregará un área plana alrededor del objeto, que es fácil de cortar después." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Altura de capa" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Ha modificado algunos ajustes del perfil. Si desea cambiarlos, hágalo en el modo personalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Este perfil de calidad no se encuentra disponible para su configuración de material y tobera actual. Cámbielas para poder habilitar este perfil de calidad." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Hay un perfil personalizado activado en este momento. Para habilitar el control deslizante de calidad, seleccione un perfil de calidad predeterminado en la pestaña Personalizado" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Apagado" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimental" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3664,11 @@ msgstr "" "\n" "Haga clic para abrir el administrador de perfiles." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Deshabilitar extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Placa de impresión" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Perfil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configuraciones" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Seleccionar configuración" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configuraciones" @@ -3984,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Habilitado" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilice pegamento con esta combinación de materiales para lograr una mejor adhesión." @@ -4406,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cerrando Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "¿Seguro que desea salir de Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir archivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar paquete" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir archivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Hemos encontrado uno o más archivos de GCode entre los archivos que ha seleccionado. Solo puede abrir los archivos GCode de uno en uno. Si desea abrir un archivo GCode, seleccione solo uno." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Agregar impresora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Novedades" @@ -4514,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Acerca de Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versión: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solución completa para la impresión 3D de filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4504,122 @@ msgstr "" "Ultimaker B.V. ha desarrollado Cura en cooperación con la comunidad.\n" "Cura se enorgullece de utilizar los siguientes proyectos de código abierto:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interfaz gráfica de usuario (GUI)" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Entorno de la aplicación" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Generador de GCode" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicación entre procesos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Lenguaje de programación" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Entorno de la GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Enlaces del entorno de la GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de enlaces C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de intercambio de datos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Biblioteca de apoyo para cálculos científicos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de apoyo para cálculos más rápidos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de apoyo para gestionar archivos STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Biblioteca de compatibilidad para trabajar con objetos planos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Biblioteca de compatibilidad para trabajar con mallas triangulares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Biblioteca de compatibilidad para analizar redes complejas" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de compatibilidad para trabajar con archivos 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Biblioteca de compatibilidad para metadatos y transmisión de archivos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicación en serie" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de detección para Zeroconf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recorte de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca HTTP de Python" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Fuente" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Iconos SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementación de la aplicación de distribución múltiple de Linux" @@ -4668,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Placa de impresión" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 y material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "No mostrar resumen de proyecto al guardar de nuevo" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Guardar" @@ -4869,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Solución de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nombre de la impresora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Indique un nombre para su impresora" @@ -4933,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Empezar" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Comprobador de modelos" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Vuelva el contenido de todas las configuraciones en un archivo HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "God Mode" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Actualizador de firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Crear un perfil de cambios de calidad aplanado." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Aplanador de perfil" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Actualización de la versión 3.3 a la 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Escritor de perfiles de Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite a los fabricantes de material crear nuevos perfiles de material y calidad mediante una IU integrada." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Imprimir asistente del perfil" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lector de perfiles de Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Aplanar ajustes activos" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "El perfil se ha aplanado y activado." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Escribe X3g en archivos" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Archivo X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Archivo X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Asistente del perfil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Asistente del perfil" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Volver a intentar" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "No crear soporte en otros modelos (por superposición)" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modificar ajustes de otros modelos (por superposición)" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modificar ajustes del relleno de otros modelos" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Actualizar existente" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "No compatible" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Consejo" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Ensayo de impresión" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificación" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Seleccione cualquier actualización de este Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Bloque Olsson" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Renderizado de cámara: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Utilizar funcionalidad de placa de impresión múltiple" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Utilizar funcionalidad de placa de impresión múltiple (reinicio requerido)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Perfiles predeterminados" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "buscar ajustes" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Altura de capa" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Este perfil de calidad no se encuentra disponible para su configuración de material y tobera actual. Cámbielas para poder habilitar este perfil de calidad." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Hay un perfil personalizado activado en este momento. Para habilitar el control deslizante de calidad, seleccione un perfil de calidad predeterminado en la pestaña Personalizado" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Placa de impresión" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Perfil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Placa de impresión" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Vuelva el contenido de todas las configuraciones en un archivo HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "God Mode" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Crear un perfil de cambios de calidad aplanado." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Aplanador de perfil" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite a los fabricantes de material crear nuevos perfiles de material y calidad mediante una IU integrada." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Imprimir asistente del perfil" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Conectado a través de la red." diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index db1bfea9d8..ceeefc1529 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index b6c8b1fbf1..2651792d76 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Spanish , Spanish \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Número de capas inferiores. Al calcularlo por el grosor inferior, este valor se redondea a un número entero." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,8 +1433,7 @@ msgstr "Habilitar alisado" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Pasar por la superficie superior una vez más, pero esta vez extruyendo muy poco material, para derretir la capa superior del plástico y crear una superficie" -" más lisa. La presión de la cámara en la boquilla se mantiene alta para que los pliegues de la superficie se llenen de material." +msgstr "Pasar por la superficie superior una vez más, pero esta vez extruyendo muy poco material, para derretir la capa superior del plástico y crear una superficie más lisa. La presión de la cámara en la boquilla se mantiene alta para que los pliegues de la superficie se llenen de material." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -3568,9 +3577,7 @@ msgstr "Dirección de línea de relleno de soporte" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan" -" las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la" -" lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se usa el ángulo predeterminado de 0 grados." +msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se usa el ángulo predeterminado de 0 grados." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3984,8 +3991,8 @@ msgstr "Área de la interfaz de soporte mínima" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamaño del área mínima para los polígonos de la interfaz de soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3994,8 +4001,8 @@ msgstr "Área de los techos del soporte mínima" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamaño del área mínima para los techos del soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4004,8 +4011,8 @@ msgstr "Área de los suelos del soporte mínima" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamaño del área mínima para los suelos del soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4045,10 +4052,7 @@ msgstr "Direcciones de línea de interfaz de soporte" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan" -" las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la" -" lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45" -" y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." +msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45 y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4058,10 +4062,7 @@ msgstr "Direcciones de línea del techo de soporte" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan" -" las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la" -" lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45" -" y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." +msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45 y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4071,10 +4072,7 @@ msgstr "Direcciones de línea del suelo de soporte" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan" -" las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la" -" lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45" -" y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." +msgstr "Una lista de los valores enteros de las direcciones de línea que se van a utilizar. Los elementos de la lista se usan secuencialmente a medida que avanzan las capas y cuando se alcanza el final de la lista, comienza de nuevo desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía, lo que significa que se utilizan los ángulos estándar (que varían entre 45 y 135 grados si las interfaces son bastante gruesas o de 90 grados en otro caso)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4800,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Eliminar (si las hubiera) las capas vacías por debajo de la primera capa impresa. Deshabilitar este ajuste puede hacer que aparezcan primeras capas vacías si el ajuste de tolerancia de segmentación está establecido en Exclusiva o Medio." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Resolución máxima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "El tamaño mínimo de un segmento de línea tras la segmentación. Si se aumenta, la resolución de la malla será menor. Esto puede permitir a la impresora mantener la velocidad que necesita para procesar GCode y aumentará la velocidad de segmentación al eliminar detalles de la malla que, de todas formas, no puede procesar." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Resolución de desplazamiento máximo" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "El tamaño mínimo de un segmento de línea de desplazamiento tras la segmentación. Si se aumenta, los movimientos de desplazamiento tendrán esquinas menos suavizadas. Esto puede le permite a la impresora mantener la velocidad que necesita para procesar GCode pero puede ocasionar que evitar el modelo sea menos preciso." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Desviación máxima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "La desviación máxima permitida al reducir la resolución en el ajuste de la resolución máxima. Si se aumenta el valor, la impresión será menos precisa pero el GCode será más pequeño. La desviación máxima es un límite para la resolución máxima, por lo que si las dos entran en conflicto, la desviación máxima siempre tendrá prioridad." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5175,38 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Se filtran los polígonos en capas segmentadas que tienen una circunferencia más pequeña que esta. Los valores más pequeños suponen una resolución de malla mayor a costa de un tiempo de segmentación. Está indicado, sobre todo, para impresoras SLA y modelos 3D muy pequeños con muchos detalles." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Resolución máxima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "El tamaño mínimo de un segmento de línea tras la segmentación. Si se aumenta, la resolución de la malla será menor. Esto puede permitir a la impresora mantener la velocidad que necesita para procesar GCode y aumentará la velocidad de segmentación al eliminar detalles de la malla que, de todas formas, no puede procesar." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Resolución de desplazamiento máximo" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "El tamaño mínimo de un segmento de línea de desplazamiento tras la segmentación. Si se aumenta, los movimientos de desplazamiento tendrán esquinas menos suavizadas. Esto puede le permite a la impresora mantener la velocidad que necesita para procesar GCode pero puede ocasionar que evitar el modelo sea menos preciso." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Desviación máxima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "La desviación máxima permitida al reducir la resolución en el ajuste de la resolución máxima. Si se aumenta el valor, la impresión será menos precisa pero" -" el GCode será más pequeño. La desviación máxima es un límite para la resolución máxima, por lo que si las dos entran en conflicto, la desviación máxima" -" siempre tendrá prioridad." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5347,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Velocidad a la que se desplaza durante el depósito por inercia con relación a la velocidad de la trayectoria de extrusión. Se recomienda un valor ligeramente por debajo del 100%, ya que la presión en el tubo guía disminuye durante el movimiento depósito por inercia." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Alternar la rotación del forro" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterna la dirección en la que se imprimen las capas superiores/inferiores. Normalmente, se imprimen únicamente en diagonal. Este ajuste añade las direcciones solo X y solo Y." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5529,23 +5515,23 @@ msgstr "Distancia media entre los puntos aleatorios introducidos en cada segment #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Desplazamiento de extrusión máximo del factor de compensación del caudal" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Distancia máxima en mm que se va a compensar." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Factor de compensación del caudal" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "La multiplicación factor por caudal da como resultado la conversión de distancia." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5838,13 +5824,13 @@ msgstr "La diferencia de altura de la siguiente altura de capa en comparación c #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Umbral de las capas de adaptación" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Umbral para usar o no una capa más pequeña. Este número se compara con el curtido de la pendiente más empinada de una capa." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5853,8 +5839,8 @@ msgstr "Ángulo de voladizo de pared" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Las paredes con un ángulo de voladizo mayor que este se imprimirán con los ajustes de voladizo de pared. Cuando el valor sea 90, no se aplicará la condición de voladizo a la pared." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6233,19 +6219,18 @@ msgstr "Velocidad de pequeñas partes" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Las pequeñas partes se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión y la precisión." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Velocidad de primera capa" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Las pequeñas partes de la primera capa se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión" -" y la precisión." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6307,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformación que se aplicará al modelo cuando se cargue desde el archivo." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamaño del área mínima para los polígonos de la interfaz de soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamaño del área mínima para los techos del soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamaño del área mínima para los suelos del soporte. No se generarán polígonos que posean un área de menor tamaño que este valor." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Alternar la rotación del forro" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterna la dirección en la que se imprimen las capas superiores/inferiores. Normalmente, se imprimen únicamente en diagonal. Este ajuste añade las direcciones solo X y solo Y." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Desplazamiento de extrusión máximo del factor de compensación del caudal" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Distancia máxima en mm que se va a compensar." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Factor de compensación del caudal" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "La multiplicación factor por caudal da como resultado la conversión de distancia." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Umbral de las capas de adaptación" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Umbral para usar o no una capa más pequeña. Este número se compara con el curtido de la pendiente más empinada de una capa." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Las paredes con un ángulo de voladizo mayor que este se imprimirán con los ajustes de voladizo de pared. Cuando el valor sea 90, no se aplicará la condición de voladizo a la pared." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Las pequeñas partes se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión y la precisión." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Velocidad de primera capa" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Las pequeñas partes de la primera capa se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión y la precisión." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Pasar por la superficie superior una vez más, pero sin extruir material, para derretir la parte externa del plástico y crear una superficie más lisa." diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 66d5f9167f..4ae527e04e 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Laitteen asetukset" @@ -38,13 +38,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "GCode-tiedosto" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "" @@ -54,7 +54,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -69,16 +69,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Aktivoitujen asetusten tasoitus" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Profiili on tasoitettu ja aktivoitu." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -119,21 +109,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-tiedosto" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -205,9 +180,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Ei voitu tallentaa siirrettävälle asemalle {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Virhe" @@ -237,8 +212,8 @@ msgstr "Poista siirrettävä asema {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Varoitus" @@ -270,17 +245,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Yhdistä verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Tulosta verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Tulosta verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "" @@ -295,6 +270,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -495,7 +485,7 @@ msgid "GIF Image" msgstr "GIF-kuva" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" msgstr "" @@ -588,12 +578,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Määritä mallikohtaiset asetukset" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Suositeltu" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Mukautettu" @@ -604,19 +594,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-tiedosto" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Suutin" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "" @@ -696,16 +686,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiili" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -726,7 +706,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -742,134 +721,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Tiedosto on jo olemassa" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Tiedosto {0} on jo olemassa. Haluatko varmasti kirjoittaa sen päälle?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Tuntematon" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Profiilin vienti epäonnistui tiedostoon {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Profiilin vienti epäonnistui tiedostoon {0}: Kirjoitin-lisäosa ilmoitti virheestä." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profiili viety tiedostoon {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Onnistuneesti tuotu profiili {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profiililla {0} on tuntematon tiedostotyyppi tai se on vioittunut." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Mukautettu profiili" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profiilista puuttuu laatutyyppi." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -935,14 +928,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Muu" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Esiviipaloitu tiedosto {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "" @@ -956,9 +948,9 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Sulje" @@ -973,40 +965,85 @@ msgstr "Lisää" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Peruuta" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Mukautetut profiilit" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Tuntematon" +msgid "Custom Material" +msgstr "Mukautettu materiaali" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Mukautettu" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1018,17 +1055,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Mukautettu materiaali" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Mukautettu" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1064,11 +1090,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "" -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Yritä uudelleen" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1245,62 +1266,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ladataan laitteita..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Asetetaan näkymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ladataan käyttöliittymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Vain yksi G-code-tiedosto voidaan ladata kerralla. Tiedoston {0} tuonti ohitettiin." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Muita tiedostoja ei voida ladata, kun G-code latautuu. Tiedoston {0} tuonti ohitettiin." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (leveys)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1309,57 +1335,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (syvyys)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (korkeus)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Alustan muoto" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X väh." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y väh." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X enint." @@ -1369,22 +1395,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y enint." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Suulakkeiden määrä" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -1463,7 +1489,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1655,11 +1681,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1915,9 +1936,9 @@ msgid "Edit" msgstr "Muokkaa" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Poista" @@ -1938,61 +1959,61 @@ msgctxt "@label" msgid "Type" msgstr "Tyyppi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Laiteohjelmistoversio" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Osoite" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Tämän osoitteen tulostin ei ole vielä vastannut." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Yhdistä" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Tulostimen osoite" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2047,17 +2068,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Tulosta" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Tulosta verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Tulosta" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "" @@ -2404,72 +2425,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Tasoitus" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Valitse asetukset" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Valitse tätä mallia varten mukautettavat asetukset" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Suodatin..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Näytä kaikki" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Valitse asetukset" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Avaa projekti" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Päivitä nykyinen" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Luo uusi" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2494,6 +2514,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Luo uusi" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2507,7 +2532,7 @@ msgid "Printer Group" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profiilin asetukset" @@ -2518,75 +2543,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Miten profiilin ristiriita pitäisi ratkaista?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nimi" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Ei profiilissa" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 ohitus" msgstr[1] "%1 ohitusta" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Johdettu seuraavista" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 ohitus" msgstr[1] "%1, %2 ohitusta" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Materiaaliasetukset" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Miten materiaalin ristiriita pitäisi ratkaista?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Asetusten näkyvyys" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Tila" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Näkyvät asetukset:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1/%2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Avaa" @@ -2693,54 +2724,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Vie" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Valitse tähän Ultimaker 2 -laitteeseen tehdyt päivitykset." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block -lämmitysosa" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2826,170 +2809,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Haluatko varmasti keskeyttää tulostuksen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Tiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Näytä nimi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Merkki" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Materiaalin tyyppi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Väri" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Ominaisuudet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Tiheys" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Läpimitta" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Tulostuslangan hinta" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Tulostuslangan paino" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Tulostuslangan pituus" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Hinta metriä kohden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Materiaali on linkitetty kohteeseen %1 ja niillä on joitain samoja ominaisuuksia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Poista materiaalin linkitys" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Kuvaus" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Tarttuvuustiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Tulostusasetukset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Aktivoi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Luo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Jäljennös" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Tuo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Vie" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Tuo materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Materiaalin tuominen epäonnistui: %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaalin tuominen onnistui: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Vie materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Materiaalin vieminen epäonnistui kohteeseen %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaalin vieminen onnistui kohteeseen %1" @@ -3004,27 +2993,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Tarkista kaikki" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Laskettu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Asetus" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profiili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Nykyinen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Yksikkö" @@ -3035,307 +3024,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Yleiset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Käyttöliittymä" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Kieli:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Valuutta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Teema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Sovellus on käynnistettävä uudelleen, jotta nämä muutokset tulevat voimaan." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Viipaloi automaattisesti, kun asetuksia muutetaan." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Viipaloi automaattisesti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Näyttöikkunan käyttäytyminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Korosta mallin vailla tukea olevat alueet punaisella. Ilman tukea nämä alueet eivät tulostu kunnolla." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Näytä uloke" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Siirtää kameraa siten, että valittuna oleva malli on näkymän keskellä." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Keskitä kamera kun kohde on valittu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Pitääkö Curan oletusarvoinen zoom-toimintatapa muuttaa päinvastaiseksi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Käännä kameran zoomin suunta päinvastaiseksi." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Tuleeko zoomauksen siirtyä hiiren suuntaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomaa hiiren suuntaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Pitäisikö alustalla olevia malleja siirtää niin, etteivät ne enää leikkaa toisiaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Varmista, että mallit ovat erillään" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pitäisikö tulostusalueella olevia malleja siirtää alas niin, että ne koskettavat tulostusalustaa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pudota mallit automaattisesti alustalle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Pakotetaanko kerros yhteensopivuustilaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Pakota kerrosnäkymän yhteensopivuustila (vaatii uudelleenkäynnistyksen)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " +msgid "Camera rendering:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Tiedostojen avaaminen ja tallentaminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Pitäisikö mallit skaalata tulostustilavuuteen, jos ne ovat liian isoja?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaalaa suuret mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Malli voi vaikuttaa erittäin pieneltä, jos sen koko on ilmoitettu esimerkiksi metreissä eikä millimetreissä. Pitäisikö nämä mallit suurentaa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaalaa erittäin pienet mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Pitäisikö tulostustyön nimeen lisätä automaattisesti tulostimen nimeen perustuva etuliite?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Lisää laitteen etuliite työn nimeen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Näytetäänkö yhteenveto, kun projektitiedosto tallennetaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Näytä yhteenvetoikkuna, kun projekti tallennetaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Projektitiedoston avaamisen oletustoimintatapa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Projektitiedoston avaamisen oletustoimintatapa: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Avaa aina projektina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Tuo mallit aina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kun olet tehnyt muutokset profiiliin ja vaihtanut toiseen, näytetään valintaikkuna, jossa kysytään, haluatko säilyttää vai hylätä muutokset. Tässä voit myös valita oletuskäytöksen, jolloin valintaikkunaa ei näytetä uudelleen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Kysy aina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Tietosuoja" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Pitäisikö Curan tarkistaa saatavilla olevat päivitykset, kun ohjelma käynnistetään?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Tarkista päivitykset käynnistettäessä" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Lähetä (anonyymit) tulostustiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3343,93 +3326,84 @@ msgid "Printers" msgstr "Tulostimet" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Nimeä uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiilit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Luo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Jäljennös" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Luo profiili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Monista profiili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Nimeä profiili uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiilin tuonti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiilin vienti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Tulostin: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Mukautetut profiilit" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Päivitä nykyiset asetukset tai ohitukset profiiliin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Hylkää tehdyt muutokset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Tässä profiilissa käytetään tulostimen oletusarvoja, joten siinä ei ole alla olevan listan asetuksia tai ohituksia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Nykyiset asetukset vastaavat valittua profiilia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Yleiset asetukset" @@ -3494,35 +3468,35 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" +msgid "Search settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Kopioi arvo kaikkiin suulakepuristimiin" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Piilota tämä asetus" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Älä näytä tätä asetusta" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pidä tämä asetus näkyvissä" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3554,17 +3528,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Riippuu seuraavista:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Arvo perustuu suulakepuristimien arvoihin " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3575,7 +3549,7 @@ msgstr "" "\n" "Palauta profiilin arvo napsauttamalla." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3586,6 +3560,13 @@ msgstr "" "\n" "Palauta laskettu arvo napsauttamalla." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3626,26 +3607,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Ota reunuksen tai pohjaristikon tulostus käyttöön. Tämä lisää kappaleen ympärille tai alle tasaisen alueen, joka on helppo leikata pois myöhemmin." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Kerroksen korkeus" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3656,12 +3622,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3672,6 +3643,11 @@ msgstr "" "\n" "Avaa profiilin hallinta napsauttamalla." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3799,11 +3775,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3839,16 +3820,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profiili" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3928,12 +3899,12 @@ msgctxt "@header" msgid "Configurations" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "" @@ -3963,12 +3934,12 @@ msgctxt "@label" msgid "Enabled" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "" @@ -4382,44 +4353,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Asetukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Avaa tiedosto(t)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Avaa tiedosto(t)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Löysimme vähintään yhden Gcode-tiedoston valitsemiesi tiedostojen joukosta. Voit avata vain yhden Gcode-tiedoston kerrallaan. Jos haluat avata Gcode-tiedoston, valitse vain yksi." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Lisää tulostin" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -4490,17 +4461,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Tietoja Curasta" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kokonaisvaltainen sulatettavan tulostuslangan 3D-tulostusratkaisu." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4509,122 +4480,122 @@ msgstr "" "Cura-ohjelman on kehittänyt Ultimaker B.V. yhteistyössä käyttäjäyhteisön kanssa.\n" "Cura hyödyntää seuraavia avoimeen lähdekoodiin perustuvia projekteja:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Graafinen käyttöliittymä" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Sovelluskehys" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Prosessien välinen tietoliikennekirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Ohjelmointikieli" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI-kehys" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI-kehyksen sidonnat" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ -sidontakirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Data Interchange Format" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Tieteellisen laskennan tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Nopeamman laskennan tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL-tiedostojen käsittelyn tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Tukikirjasto 3MF-tiedostojen käsittelyyn" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Sarjatietoliikennekirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf-etsintäkirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Monikulmion leikkauskirjasto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Fontti" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG-kuvakkeet" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -4644,32 +4615,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Tallenna projekti" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Suulake %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Älä näytä projektin yhteenvetoa tallennettaessa" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Tallenna" @@ -4845,12 +4811,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "" @@ -4907,6 +4873,31 @@ msgctxt "@button" msgid "Get started" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4967,16 +4958,6 @@ msgctxt "name" msgid "Model Checker" msgstr "" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Vedosta kaikkien asetusten sisällöt HTML-tiedostoon." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Jumala-tila" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -4987,16 +4968,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "" - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5197,6 +5168,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5397,16 +5378,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profiilin kirjoitin" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5447,6 +5418,50 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiilin lukija" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Aktivoitujen asetusten tasoitus" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Profiili on tasoitettu ja aktivoitu." + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G-tiedosto" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Yritä uudelleen" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Päivitä nykyinen" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Valitse tähän Ultimaker 2 -laitteeseen tehdyt päivitykset." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block -lämmitysosa" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Kerroksen korkeus" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profiili" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Vedosta kaikkien asetusten sisällöt HTML-tiedostoon." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Jumala-tila" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Yhdistetty verkon kautta tulostimeen." diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index 764e9ea028..1c4b135492 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index a9f1caa636..c0cec70153 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -1025,6 +1025,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Alakerrosten lukumäärä. Kun se lasketaan alaosan paksuudesta, arvo pyöristetään kokonaislukuun." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3974,7 +3984,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -3984,7 +3994,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -3994,7 +4004,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "" #: fdmprinter.def.json @@ -4779,6 +4789,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "" +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "" + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5154,36 +5194,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "" -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "" - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5324,16 +5334,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Nopeus, jolla siirrytään vapaaliu'un aikana, suhteessa pursotusreitin nopeuteen. Arvoksi suositellaan hieman alle 100 %, sillä vapaaliukusiirron aikana paine Bowden-putkessa laskee." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Vuorottele pintakalvon pyöritystä" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Muuttaa ylä-/alakerrosten tulostussuuntaa. Normaalisti ne tulostetaan vain vinottain. Tämä asetus lisää vain X- ja vain Y -suunnat." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5506,22 +5506,22 @@ msgstr "Keskimääräinen etäisyys kunkin linjasegmentin satunnaisten pisteiden #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" +msgid "Flow Rate Compensation Max Extrusion Offset" msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" +msgid "Flow Rate Compensation Factor" msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." msgstr "" #: fdmprinter.def.json @@ -5815,12 +5815,12 @@ msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" +msgid "Adaptive Layers Topography Size" msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." msgstr "" #: fdmprinter.def.json @@ -5830,7 +5830,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." msgstr "" #: fdmprinter.def.json @@ -6210,17 +6210,17 @@ msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" +msgid "Small Feature Initial Layer Speed" msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." msgstr "" #: fdmprinter.def.json @@ -6283,6 +6283,14 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Mallissa käytettävä muunnosmatriisi, kun malli ladataan tiedostosta." +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Vuorottele pintakalvon pyöritystä" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Muuttaa ylä-/alakerrosten tulostussuuntaa. Normaalisti ne tulostetaan vain vinottain. Tämä asetus lisää vain X- ja vain Y -suunnat." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Yläpinnan läpikäynti yhden ylimääräisen kerran ilman materiaalin pursotusta. Tämän tarkoitus on sulattaa yläosan muovia enemmän, jolloin saadaan sileämpi pinta." diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index ab3190c316..0e1ab565f1 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: French , French \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Paramètres de la machine" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Fichier GCode" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ne prend pas en charge le mode non-texte." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Veuillez préparer le G-Code avant d'exporter." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Assistant de modèle 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Mettre à jour le firmware" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Aplatir les paramètres actifs" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Le profil a été aplati et activé." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Impression en cours" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Écrit X3G dans des fichiers" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Fichier X3G" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Fichier X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Impossible d'enregistrer sur le lecteur {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Erreur" @@ -243,8 +218,8 @@ msgstr "Ejecter le lecteur amovible {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Avertissement" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Connecter via le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimer sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprimer sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Connecté sur le réseau" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Erreur d'impression" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "Image GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Ouvrir le maillage triangulaire compressé" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configurer les paramètres par modèle" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Recommandé" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personnalisé" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Fichier 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Buse" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Le fichier projet {0} contient un type de machine inconnu {1}. Impossible d'importer la machine. Les modèles seront importés à la place." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Ouvrir un fichier de projet" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profil Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistant de profil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistant de profil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Aperçu" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "La connexion a échoué" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Non pris en charge" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Le fichier existe déjà" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Le fichier {0} existe déjà. Êtes-vous sûr de vouloir le remplacer ?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de fichier invalide :" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles :" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Paramètres mis à jour" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrudeuse(s) désactivée(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Inconnu" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Échec de l'exportation du profil vers {0} : {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Échec de l'exportation du profil vers {0} : le plug-in du générateur a rapporté une erreur." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil exporté vers {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "L'exportation a réussi" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Impossible d'importer le profil depuis {0} : {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Impossible d'importer le profil depuis {0} avant l'ajout d'une imprimante." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Aucun profil personnalisé à importer dans le fichier {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Le profil {0} contient des données incorrectes ; échec de l'importation." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Importation du profil {0} réussie" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Le fichier {0} ne contient pas de profil valide." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Le profil {0} est un type de fichier inconnu ou est corrompu." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Personnaliser le profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il manque un type de qualité au profil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Autre" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Fichier {0} prédécoupé" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Suivant" @@ -962,9 +954,9 @@ msgstr "Groupe nº {group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Fermer" @@ -979,40 +971,85 @@ msgstr "Ajouter" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Annuler" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Pas écrasé" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Personnaliser les profils" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Tous les types supportés ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Inconnu" +msgid "Custom Material" +msgstr "Matériau personnalisé" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personnalisé" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Imprimantes en réseau disponibles" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Matériau personnalisé" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personnalisé" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Impossible d’atteindre le serveur du compte Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Réessayer" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Envoyer rapport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Chargement des machines..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Préparation de la scène..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Chargement de l'interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Un seul fichier G-Code peut être chargé à la fois. Importation de {0} sautée" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossible d'ouvrir un autre fichier si le G-Code est en cours de chargement. Importation de {0} sautée" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Le modèle sélectionné était trop petit pour être chargé." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Paramètres de l'imprimante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Largeur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profondeur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Hauteur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forme du plateau" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origine au centre" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Plateau chauffant" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volume de fabrication chauffant" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Parfum G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Paramètres de la tête d'impression" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X max" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Hauteur du portique" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Nombre d'extrudeuses" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code de démarrage" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code de fin" @@ -1477,7 +1503,7 @@ msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Machine" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print Core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Modifier" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Supprimer" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Version du firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Adresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Cette imprimante n'est pas configurée pour héberger un groupe d'imprimantes." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Cette imprimante est l'hôte d'un groupe d'imprimantes %1." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "L'imprimante à cette adresse n'a pas encore répondu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Connecter" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Adresse IP non valide" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Veuillez saisir une adresse IP valide." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Adresse de l'imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Saisissez l'adresse IP de votre imprimante sur le réseau." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Finit %1 à %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Imprimer" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Imprimer sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Imprimer" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Sélection d'imprimantes" @@ -2424,72 +2445,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Lissage" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Type de maille" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modèle normal" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Imprimer comme support" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Ne pas prendre en charge le chevauchement avec d'autres modèles" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modifier les paramètres de chevauchement avec d'autres modèles" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modifier les paramètres de remplissage d'autres modèles" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Sélectionner les paramètres" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Sélectionner les paramètres pour personnaliser ce modèle" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrer..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Afficher tout" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Type de maille" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modèle normal" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Imprimer comme support" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Sélectionner les paramètres" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Ouvrir un projet" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Mettre à jour l'existant" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Créer" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2514,6 +2534,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Mise à jour" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Créer" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2527,7 +2552,7 @@ msgid "Printer Group" msgstr "Groupe d'imprimantes" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Paramètres de profil" @@ -2538,75 +2563,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Comment le conflit du profil doit-il être résolu ?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nom" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Absent du profil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 écrasent" msgstr[1] "%1 écrase" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Dérivé de" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 écrasent" msgstr[1] "%1, %2 écrase" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Paramètres du matériau" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Comment le conflit du matériau doit-il être résolu ?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilité des paramètres" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Mode" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Paramètres visibles :" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 sur %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Le chargement d'un projet effacera tous les modèles sur le plateau." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Ouvrir" @@ -2713,54 +2744,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Créez automatiquement une sauvegarde chaque jour où Cura est démarré." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Non pris en charge" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Précédent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exporter" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Astuce" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Générique" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Test d'impression" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Liste de contrôle" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Sélectionnez les mises à niveau disponibles pour cet Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Blocage Olsson" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2846,170 +2829,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Êtes-vous sûr(e) de vouloir abandonner l'impression ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informations" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmer le changement de diamètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Le nouveau diamètre de filament est réglé sur %1 mm, ce qui n'est pas compatible avec l'extrudeuse actuelle. Souhaitez-vous poursuivre ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Afficher le nom" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marque" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Type de matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Couleur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Propriétés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densité" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diamètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Coût du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Poids du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Longueur du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Coût au mètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Ce matériau est lié à %1 et partage certaines de ses propriétés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Délier le matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Description" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informations d'adhérence" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Paramètres d'impression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Créer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliquer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exporter" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Imprimante" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmer la suppression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Êtes-vous sûr de vouloir supprimer l'objet %1 ? Vous ne pourrez pas revenir en arrière !" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importer un matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossible d'importer le matériau %1 : %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Matériau %1 importé avec succès" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Exporter un matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Échec de l'exportation de matériau vers %1 : %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Matériau exporté avec succès vers %1" @@ -3024,27 +3013,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Vérifier tout" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calculer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Actuel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unité" @@ -3055,307 +3044,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Général" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Langue :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Devise :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Thème :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Vous devez redémarrer l'application pour que ces changements prennent effet." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Découper automatiquement si les paramètres sont modifiés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Découper automatiquement" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportement Viewport" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Surligne les parties non supportées du modèle en rouge. Sans ajouter de support, ces zones ne s'imprimeront pas correctement." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Mettre en surbrillance les porte-à-faux" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Déplace la caméra afin que le modèle sélectionné se trouve au centre de la vue" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrer la caméra lorsqu'un élément est sélectionné" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Le comportement de zoom par défaut de Cura doit-il être inversé ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverser la direction du zoom de la caméra." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Le zoom doit-il se faire dans la direction de la souris ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Le zoom vers la souris n'est pas pris en charge dans la perspective orthographique." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomer vers la direction de la souris" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Les modèles dans la zone d'impression doivent-ils être déplacés afin de ne plus se croiser ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Veillez à ce que les modèles restent séparés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Les modèles dans la zone d'impression doivent-ils être abaissés afin de toucher le plateau ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Abaisser automatiquement les modèles sur le plateau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Afficher le message d'avertissement dans le lecteur G-Code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Message d'avertissement dans le lecteur G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "La couche doit-elle être forcée en mode de compatibilité ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forcer l'affichage de la couche en mode de compatibilité (redémarrage requis)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Quel type de rendu de la caméra doit-il être utilisé?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Rendu caméra : " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspective" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Orthographique" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Ouvrir et enregistrer des fichiers" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Les modèles doivent-ils être mis à l'échelle du volume d'impression s'ils sont trop grands ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Réduire la taille des modèles trop grands" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modèle peut apparaître en tout petit si son unité est par exemple en mètres plutôt qu'en millimètres. Ces modèles doivent-ils être agrandis ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Mettre à l'échelle les modèles extrêmement petits" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Les modèles doivent-ils être sélectionnés après leur chargement ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Sélectionner les modèles lorsqu'ils sont chargés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Un préfixe basé sur le nom de l'imprimante doit-il être automatiquement ajouté au nom de la tâche d'impression ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Ajouter le préfixe de la machine au nom de la tâche" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Un résumé doit-il être affiché lors de l'enregistrement d'un fichier de projet ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Afficher la boîte de dialogue du résumé lors de l'enregistrement du projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet : " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Toujours ouvrir comme projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Toujours importer les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Lorsque vous apportez des modifications à un profil puis passez à un autre profil, une boîte de dialogue apparaît, vous demandant si vous souhaitez conserver les modifications. Vous pouvez aussi choisir une option par défaut, et le dialogue ne s'affichera plus." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportement par défaut pour les valeurs de paramètres modifiées lors du passage à un profil différent : " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Toujours rejeter les paramètres modifiés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Toujours transférer les paramètres modifiés dans le nouveau profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Confidentialité" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura doit-il vérifier les mises à jour au démarrage du programme ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Vérifier les mises à jour au démarrage" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information permettant de vous identifier personnellement ne seront envoyés ou stockés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Envoyer des informations (anonymes) sur l'impression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Plus d'informations" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Expérimental" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Utiliser la fonctionnalité multi-plateau" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Utiliser la fonctionnalité multi-plateau (redémarrage requis)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3363,93 +3346,84 @@ msgid "Printers" msgstr "Imprimantes" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renommer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Créer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Dupliquer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Créer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Veuillez fournir un nom pour ce profil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Dupliquer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renommer le profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Exporter un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Imprimante : %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Profils par défaut" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Personnaliser les profils" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Mettre à jour le profil à l'aide des paramètres / forçages actuels" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Ignorer les modifications actuelles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ce profil utilise les paramètres par défaut spécifiés par l'imprimante, de sorte qu'aucun paramètre / forçage n'apparaît dans la liste ci-dessous." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Vos paramètres actuels correspondent au profil sélectionné." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Paramètres généraux" @@ -3514,35 +3488,35 @@ msgstr "Sans titre" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "paramètres de recherche" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copier la valeur vers tous les extrudeurs" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copier toutes les valeurs modifiées vers toutes les extrudeuses" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Afficher ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3574,17 +3548,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Touché par" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Ce paramètre est toujours partagé par toutes les extrudeuses. Le modifier ici entraînera la modification de la valeur pour toutes les extrudeuses." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "La valeur est résolue à partir des valeurs par extrudeur " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3595,7 +3569,7 @@ msgstr "" "\n" "Cliquez pour restaurer la valeur du profil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3606,6 +3580,13 @@ msgstr "" "\n" "Cliquez pour restaurer la valeur calculée." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3646,26 +3627,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Activez l'impression d'une bordure ou plaquette (Brim/Raft). Cela ajoutera une zone plate autour de ou sous votre objet qui est facile à découper par la suite." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Hauteur de la couche" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Vous avez modifié certains paramètres du profil. Si vous souhaitez les modifier, allez dans le mode Personnaliser." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Ce profil de qualité n'est pas disponible pour votre matériau et configuration des buses actuels. Veuillez modifier ces derniers pour activer ce profil de qualité." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Un profil personnalisé est actuellement actif. Pour activer le curseur de qualité, choisissez un profil de qualité par défaut dans l'onglet Personnaliser" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3676,12 +3642,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Off" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Expérimental" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3692,6 +3663,11 @@ msgstr "" "\n" "Cliquez pour ouvrir le gestionnaire de profils." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3819,11 +3795,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Matériau" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoris" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Générique" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3859,16 +3840,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Désactiver l'extrudeuse" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "Plateau" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3948,12 +3919,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configurations" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Sélectionner la configuration" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configurations" @@ -3983,12 +3954,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Activé" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Matériau" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utiliser de la colle pour une meilleure adhérence avec cette combinaison de matériaux." @@ -4405,44 +4376,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Paramètres" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fermeture de Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Êtes-vous sûr de vouloir quitter Cura ?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Installer le paquet" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Nous avons trouvé au moins un fichier G-Code parmi les fichiers que vous avez sélectionné. Vous ne pouvez ouvrir qu'un seul fichier G-Code à la fois. Si vous souhaitez ouvrir un fichier G-Code, veuillez ne sélectionner qu'un seul fichier de ce type." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Ajouter une imprimante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Quoi de neuf" @@ -4513,17 +4484,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "À propos de Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "version : %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solution complète pour l'impression 3D par dépôt de filament fondu." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4532,122 +4503,122 @@ msgstr "" "Cura a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker.\n" "Cura est fier d'utiliser les projets open source suivants :" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface utilisateur graphique" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Cadre d'application" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Générateur G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Bibliothèque de communication interprocess" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Langage de programmation" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Cadre IUG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Liens cadre IUG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Bibliothèque C/C++ Binding" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Format d'échange de données" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Prise en charge de la bibliothèque pour le calcul scientifique" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Prise en charge de la bibliothèque pour des maths plus rapides" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Prise en charge de la bibliothèque pour le traitement des fichiers STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Prise en charge de la bibliothèque pour le traitement des objets planaires" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Prise en charge de la bibliothèque pour le traitement des mailles triangulaires" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Prise en charge de la bibliothèque pour l'analyse de réseaux complexes" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Prise en charge de la bibliothèque pour le traitement des fichiers 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Prise en charge de la bibliothèque pour les métadonnées et le streaming de fichiers" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Bibliothèque de communication série" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bibliothèque de découverte ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliothèque de découpe polygone" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Bibliothèque Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Police" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Icônes SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Déploiement d'applications sur multiples distributions Linux" @@ -4667,32 +4638,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Enregistrer le projet" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Plateau" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrudeuse %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & matériau" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Matériau" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Ne pas afficher à nouveau le résumé du projet lors de l'enregistrement" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Enregistrer" @@ -4868,12 +4834,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Dépannage" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nom de l'imprimante" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Veuillez donner un nom à votre imprimante" @@ -4932,6 +4898,31 @@ msgctxt "@button" msgid "Get started" msgstr "Prise en main" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4992,16 +4983,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Contrôleur de modèle" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Exporter les contenus de tous les paramètres vers un fichier HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Mode God" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5012,16 +4993,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Programme de mise à jour du firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Créer un profil de changements de qualité aplati." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Aplatisseur de profil" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5222,6 +5193,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Mise à niveau de 3.3 vers 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5422,16 +5403,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Générateur de profil Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permet aux fabricants de matériaux de créer de nouveaux matériaux et profils de qualité à l'aide d'une interface utilisateur ad hoc." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistant de profil d'impression" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5472,6 +5443,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lecteur de profil Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Aplatir les paramètres actifs" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Le profil a été aplati et activé." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Écrit X3G dans des fichiers" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Fichier X3G" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Fichier X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Ouvrir le maillage triangulaire compressé" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistant de profil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistant de profil" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Réessayer" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print Core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Ne pas prendre en charge le chevauchement avec d'autres modèles" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modifier les paramètres de chevauchement avec d'autres modèles" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modifier les paramètres de remplissage d'autres modèles" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Mettre à jour l'existant" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Non pris en charge" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Précédent" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Astuce" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Test d'impression" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Liste de contrôle" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Sélectionnez les mises à niveau disponibles pour cet Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Blocage Olsson" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Rendu caméra : " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Utiliser la fonctionnalité multi-plateau" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Utiliser la fonctionnalité multi-plateau (redémarrage requis)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Profils par défaut" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "paramètres de recherche" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Hauteur de la couche" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Ce profil de qualité n'est pas disponible pour votre matériau et configuration des buses actuels. Veuillez modifier ces derniers pour activer ce profil de qualité." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Un profil personnalisé est actuellement actif. Pour activer le curseur de qualité, choisissez un profil de qualité par défaut dans l'onglet Personnaliser" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "Plateau" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Plateau" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Exporter les contenus de tous les paramètres vers un fichier HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Mode God" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Créer un profil de changements de qualité aplati." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Aplatisseur de profil" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permet aux fabricants de matériaux de créer de nouveaux matériaux et profils de qualité à l'aide d'une interface utilisateur ad hoc." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistant de profil d'impression" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Connecté sur le réseau." diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index 45dd52774f..3e58acfe03 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: French\n" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index e21e5ea1e6..cc1fb22d67 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: French , French \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Le nombre de couches inférieures. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie à un nombre entier." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,8 +1433,7 @@ msgstr "Activer l'étirage" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Allez au-dessus de la surface une fois supplémentaire, mais en extrudant très peu de matériau. Cela signifie de faire fondre le plastique en haut un peu" -" plus, pour créer une surface lisse. La pression dans la chambre de la buse est maintenue élevée afin que les plis de la surface soient remplis de matériau." +msgstr "Allez au-dessus de la surface une fois supplémentaire, mais en extrudant très peu de matériau. Cela signifie de faire fondre le plastique en haut un peu plus, pour créer une surface lisse. La pression dans la chambre de la buse est maintenue élevée afin que les plis de la surface soient remplis de matériau." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1709,8 +1718,7 @@ msgstr "Randomiser le démarrage du remplissage" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "Randomisez la ligne de remplissage qui est imprimée en premier. Cela empêche un segment de devenir plus fort, mais cela se fait au prix d'un déplacement" -" supplémentaire." +msgstr "Randomisez la ligne de remplissage qui est imprimée en premier. Cela empêche un segment de devenir plus fort, mais cela se fait au prix d'un déplacement supplémentaire." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -3569,9 +3577,7 @@ msgstr "Direction de ligne de remplissage du support" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement" -" des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière" -" est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que l'angle par défaut est utilisé (0 degré)." +msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que l'angle par défaut est utilisé (0 degré)." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3985,8 +3991,8 @@ msgstr "Surface minimale de l'interface de support" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Taille minimale de la surface des polygones d'interface de support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3995,8 +4001,8 @@ msgstr "Surface minimale du plafond de support" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Taille minimale de la surface des plafonds du support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4005,8 +4011,8 @@ msgstr "Surface minimale du bas de support" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Taille minimale de la surface des bas du support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4046,10 +4052,7 @@ msgstr "Direction de ligne d'interface du support" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement" -" des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière" -" est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et" -" 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." +msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4059,10 +4062,7 @@ msgstr "Direction de la ligne de plafond de support" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement" -" des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière" -" est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et" -" 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." +msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4072,10 +4072,7 @@ msgstr "Direction de la ligne de bas de support" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement" -" des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière" -" est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et" -" 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." +msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles par défaut sont utilisés (alternative entre 45 et 135 degrés si les interfaces sont assez épaisses ou 90 degrés)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4801,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Supprimer les couches vides sous la première couche imprimée si elles sont présentes. Le fait de désactiver ce paramètre peut entraîner l'apparition de premières couches vides si le paramètre Tolérance à la découpe est défini sur Exclusif ou Milieu." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Résolution maximum" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Taille minimum d'un segment de ligne après découpage. Si vous augmentez cette valeur, la maille aura une résolution plus faible. Cela peut permettre à l'imprimante de suivre la vitesse à laquelle elle doit traiter le G-Code et augmentera la vitesse de découpe en enlevant des détails de la maille que l'imprimante ne peut pas traiter de toute manière." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Résolution de déplacement maximum" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Taille minimale d'un segment de ligne de déplacement après la découpe. Si vous augmentez cette valeur, les mouvements de déplacement auront des coins moins lisses. Cela peut permettre à l'imprimante de suivre la vitesse à laquelle elle doit traiter le G-Code, mais cela peut réduire la précision de l'évitement du modèle." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Écart maximum" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "L'écart maximum autorisé lors de la réduction de la résolution pour le paramètre Résolution maximum. Si vous augmentez cette valeur, l'impression sera moins précise, mais le G-Code sera plus petit. L'écart maximum est une limite pour la résolution maximum. Donc si les deux entrent en conflit, l'Écart maximum restera valable." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5176,38 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Les polygones en couches tranchées dont la circonférence est inférieure à cette valeur seront filtrés. Des valeurs élevées permettent d'obtenir un maillage de meilleure résolution mais augmentent le temps de découpe. Cette option est principalement destinée aux imprimantes SLA haute résolution et aux modèles 3D de très petite taille avec beaucoup de détails." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Résolution maximum" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Taille minimum d'un segment de ligne après découpage. Si vous augmentez cette valeur, la maille aura une résolution plus faible. Cela peut permettre à l'imprimante de suivre la vitesse à laquelle elle doit traiter le G-Code et augmentera la vitesse de découpe en enlevant des détails de la maille que l'imprimante ne peut pas traiter de toute manière." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Résolution de déplacement maximum" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Taille minimale d'un segment de ligne de déplacement après la découpe. Si vous augmentez cette valeur, les mouvements de déplacement auront des coins moins lisses. Cela peut permettre à l'imprimante de suivre la vitesse à laquelle elle doit traiter le G-Code, mais cela peut réduire la précision de l'évitement du modèle." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Écart maximum" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "L'écart maximum autorisé lors de la réduction de la résolution pour le paramètre Résolution maximum. Si vous augmentez cette valeur, l'impression sera" -" moins précise, mais le G-Code sera plus petit. L'écart maximum est une limite pour la résolution maximum. Donc si les deux entrent en conflit, l'Écart" -" maximum restera valable." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5348,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Vitesse de déplacement pendant une roue libre, par rapport à la vitesse de déplacement pendant l'extrusion. Une valeur légèrement inférieure à 100 % est conseillée car, lors du mouvement en roue libre, la pression dans le tube bowden chute." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Alterner la rotation dans les couches extérieures" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterne le sens d'impression des couches du dessus/dessous. Elles sont généralement imprimées uniquement en diagonale. Ce paramètre ajoute les sens X uniquement et Y uniquement." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5530,23 +5515,23 @@ msgstr "Distance moyenne entre les points ajoutés aléatoirement sur chaque seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Décalage d'extrusion max. pour compensation du débit" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Distance de compensation maximum en mm." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Facteur de compensation du débit" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Facteur de multiplication pour le débit -> translation de la distance." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5839,13 +5824,13 @@ msgstr "Différence de hauteur de la couche suivante par rapport à la précéde #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Limite des couches adaptatives" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Limite indiquant d'utiliser ou non une couche plus petite. Ce nombre est comparé à la tangente de la pente la plus raide d'une couche." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5854,8 +5839,8 @@ msgstr "Angle de parois en porte-à-faux" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune paroi ne sera considérée comme étant en porte-à-faux." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6234,20 +6219,18 @@ msgstr "Vitesse de petite structure" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Les petites structures seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider à l'adhésion et à la" -" précision." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Vitesse de la première couche" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Les petites structures sur la première couche seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider" -" à l'adhésion et à la précision." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6309,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice de transformation à appliquer au modèle lors de son chargement depuis le fichier." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Taille minimale de la surface des polygones d'interface de support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Taille minimale de la surface des plafonds du support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Taille minimale de la surface des bas du support : les polygones dont la surface est inférieure à cette valeur ne seront pas générés." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Alterner la rotation dans les couches extérieures" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterne le sens d'impression des couches du dessus/dessous. Elles sont généralement imprimées uniquement en diagonale. Ce paramètre ajoute les sens X uniquement et Y uniquement." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Décalage d'extrusion max. pour compensation du débit" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Distance de compensation maximum en mm." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Facteur de compensation du débit" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Facteur de multiplication pour le débit -> translation de la distance." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Limite des couches adaptatives" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Limite indiquant d'utiliser ou non une couche plus petite. Ce nombre est comparé à la tangente de la pente la plus raide d'une couche." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune paroi ne sera considérée comme étant en porte-à-faux." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Les petites structures seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider à l'adhésion et à la précision." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Vitesse de la première couche" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Les petites structures sur la première couche seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider à l'adhésion et à la précision." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Aller au-dessus de la surface supérieure une fois supplémentaire, mais sans extruder de matériau. Cela signifie de faire fondre le plastique en haut un peu plus, pour créer une surface lisse." diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 0d4d32caef..ad4e6213df 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" "Language-Team: Italian , Italian \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.1.1\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Impostazioni macchina" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "File G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter non supporta la modalità non di testo." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Preparare il codice G prima dell’esportazione." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Assistente modello 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Aggiornamento firmware" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Impostazioni attive profilo appiattito" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Il profilo è stato appiattito e attivato." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Stampa in corso" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Scrive X3g sui file" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "File X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "File X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Impossibile salvare su unità rimovibile {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Errore" @@ -243,8 +218,8 @@ msgstr "Rimuovi il dispositivo rimovibile {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Avvertenza" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Collega tramite rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Stampa sulla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Stampa sulla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Collegato alla rete" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Errore di stampa" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "Immagine GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configura impostazioni per modello" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Consigliata" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizzata" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "File 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Ugello" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Il file di progetto {0} contiene un tipo di macchina sconosciuto {1}. Impossibile importare la macchina. Verranno invece importati i modelli." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Apri file progetto" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profilo Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente profilo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente profilo" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Anteprima" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Login non riuscito" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Non supportato" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Il file esiste già" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Il file {0} esiste già. Sei sicuro di volerlo sovrascrivere?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "File URL non valido:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Le impostazioni sono state modificate in base all’attuale disponibilità di estrusori:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Impostazioni aggiornate" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Estrusore disabilitato" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Sconosciuto" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Impossibile esportare il profilo su {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Impossibile esportare il profilo su {0}: Rilevata anomalia durante scrittura plugin." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profilo esportato su {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Esportazione riuscita" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Impossibile importare il profilo da {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Impossibile importare il profilo da {0} prima di aggiungere una stampante." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Nessun profilo personalizzato da importare nel file {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Impossibile importare il profilo da {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Questo profilo {0} contiene dati errati, impossibile importarlo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Impossibile importare il profilo da {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profilo importato correttamente {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Il file {0} non contiene nessun profilo valido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Il profilo {0} ha un tipo di file sconosciuto o corrotto." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Profilo personalizzato" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il profilo è privo del tipo di qualità." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Altro" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "File pre-sezionato {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Avanti" @@ -962,9 +954,9 @@ msgstr "Gruppo #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Chiudi" @@ -979,40 +971,85 @@ msgstr "Aggiungi" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Annulla" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Non sottoposto a override" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Profili personalizzati" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Tutti i tipi supportati ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tutti i file (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Sconosciuto" +msgid "Custom Material" +msgstr "Materiale personalizzato" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personalizzata" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Stampanti disponibili in rete" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Materiale personalizzato" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personalizzata" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Impossibile raggiungere il server account Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Riprova" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Invia report" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Caricamento macchine in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Impostazione scena in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Caricamento interfaccia in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "È possibile caricare un solo file codice G per volta. Importazione saltata {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossibile aprire altri file durante il caricamento del codice G. Importazione saltata {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Il modello selezionato è troppo piccolo per il caricamento." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Impostazioni della stampante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Larghezza)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profondità)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altezza)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forma del piano di stampa" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origine al centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Piano riscaldato" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volume di stampa riscaldato" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Versione codice G" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Impostazioni della testina di stampa" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X max" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Altezza gantry" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Numero di estrusori" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Codice G avvio" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Codice G fine" @@ -1477,7 +1503,7 @@ msgstr "Plugin" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Macchina" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print Core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Modifica" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Rimuovi" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Versione firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Indirizzo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Questa stampante non è predisposta per comandare un gruppo di stampanti." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Questa stampante comanda un gruppo di %1 stampanti." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "La stampante a questo indirizzo non ha ancora risposto." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Collega" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Indirizzo IP non valido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Inserire un indirizzo IP valido." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Indirizzo stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Inserire l'indirizzo IP della stampante in rete." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Finisce %1 a %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Stampa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Stampa sulla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Stampa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Selezione stampante" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Smoothing" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Tipo di maglia" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modello normale" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Stampa come supporto" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Non supporta sovrapposizione con altri modelli" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modifica impostazioni per sovrapposizione con altri modelli" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modifica impostazioni per riempimento di altri modelli" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Seleziona impostazioni" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleziona impostazioni di personalizzazione per questo modello" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtro..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostra tutto" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Tipo di maglia" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modello normale" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Stampa come supporto" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Seleziona impostazioni" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Apri progetto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Aggiorna esistente" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Crea nuovo" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Aggiorna" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Crea nuovo" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "Gruppo stampanti" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Impostazioni profilo" @@ -2539,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Come può essere risolto il conflitto nel profilo?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Non nel profilo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 override" msgstr[1] "%1 override" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivato da" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 override" msgstr[1] "%1, %2 override" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Impostazioni materiale" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Come può essere risolto il conflitto nel materiale?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Impostazione visibilità" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modalità" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Impostazioni visibili:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 su %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Il caricamento di un progetto annulla tutti i modelli sul piano di stampa." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Apri" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Crea automaticamente un backup ogni giorno in cui viene avviata Cura." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Non supportato" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Precedente" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Esporta" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Suggerimento" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Generale" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Prova di stampa" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista di controllo" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Seleziona qualsiasi aggiornamento realizzato per questa Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Blocco Olsson" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Sei sicuro di voler interrompere la stampa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informazioni" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Conferma modifica diametro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Il nuovo diametro del filamento impostato a %1 mm non è compatibile con l'attuale estrusore. Continuare?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Visualizza nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marchio" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Tipo di materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Colore" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Proprietà" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densità" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diametro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Costo del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Peso del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Lunghezza del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Costo al metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Questo materiale è collegato a %1 e condivide alcune delle sue proprietà." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Scollega materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Descrizione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informazioni sull’aderenza" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Impostazioni di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Attiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Crea" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Esporta" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Stampante" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Conferma rimozione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Sei sicuro di voler rimuovere %1? Questa operazione non può essere annullata!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importa materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossibile importare materiale {1}: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiale importato correttamente %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Esporta materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Impossibile esportare il materiale su %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiale esportato correttamente su %1" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Controlla tutto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calcolato" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Corrente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unità" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Generale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interfaccia" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Lingua:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Riavviare l'applicazione per rendere effettive le modifiche." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seziona automaticamente alla modifica delle impostazioni." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seziona automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento del riquadro di visualizzazione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Evidenzia in rosso le zone non supportate del modello. In assenza di supporto, queste aree non saranno stampate in modo corretto." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Visualizza sbalzo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Sposta la fotocamera in modo che il modello si trovi al centro della visualizzazione quando è selezionato" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centratura fotocamera alla selezione dell'elemento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Il comportamento dello zoom predefinito di Cura dovrebbe essere invertito?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverti la direzione dello zoom della fotocamera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Lo zoom si muove nella direzione del mouse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Nella prospettiva ortogonale lo zoom verso la direzione del mouse non è supportato." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoom verso la direzione del mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "I modelli sull’area di stampa devono essere spostati per evitare intersezioni?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assicurarsi che i modelli siano mantenuti separati" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "I modelli sull’area di stampa devono essere portati a contatto del piano di stampa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Rilascia automaticamente i modelli sul piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Visualizza il messaggio di avvertimento sul lettore codice G." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Messaggio di avvertimento sul lettore codice G" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Lo strato deve essere forzato in modalità di compatibilità?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzare la modalità di compatibilità visualizzazione strato (riavvio necessario)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Quale tipo di rendering della fotocamera è necessario utilizzare?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Rendering fotocamera: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Prospettiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortogonale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Apertura e salvataggio file" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "I modelli devono essere ridimensionati al volume di stampa, se troppo grandi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Ridimensiona i modelli troppo grandi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modello può apparire eccessivamente piccolo se la sua unità di misura è espressa in metri anziché in millimetri. Questi modelli devono essere aumentati?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Ridimensiona i modelli eccessivamente piccoli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "I modelli devono essere selezionati dopo essere stati caricati?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selezionare i modelli dopo il caricamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Al nome del processo di stampa deve essere aggiunto automaticamente un prefisso basato sul nome della stampante?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Aggiungi al nome del processo un prefisso macchina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Quando si salva un file di progetto deve essere visualizzato un riepilogo?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Visualizza una finestra di riepilogo quando si salva un progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinito all'apertura di un file progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinito all'apertura di un file progetto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Apri sempre come progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importa sempre i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Dopo aver modificato un profilo ed essere passati a un altro, si apre una finestra di dialogo che chiede se mantenere o eliminare le modifiche oppure se scegliere un comportamento predefinito e non visualizzare più tale finestra di dialogo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinito per i valori di impostazione modificati al passaggio a un profilo diverso: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Elimina sempre le impostazioni modificate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Trasferisci sempre le impostazioni modificate a un nuovo profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura deve verificare la presenza di eventuali aggiornamenti all’avvio del programma?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Controlla aggiornamenti all’avvio" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "I dati anonimi sulla stampa devono essere inviati a Ultimaker? Nota, non sono trasmessi o memorizzati modelli, indirizzi IP o altre informazioni personali." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Invia informazioni di stampa (anonime)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Ulteriori informazioni" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Sperimentale" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Utilizzare la funzionalità piano di stampa multiplo" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Utilizzare la funzionalità piano di stampa multiplo (necessario riavvio)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "Stampanti" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Rinomina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Crea" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Crea profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Indica un nome per questo profilo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplica profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Rinomina profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importa profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Esporta profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Stampante: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Profili predefiniti" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Profili personalizzati" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Elimina le modifiche correnti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Questo profilo utilizza le impostazioni predefinite dalla stampante, perciò non ci sono impostazioni/esclusioni nell’elenco riportato di seguito." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Le impostazioni correnti corrispondono al profilo selezionato." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Impostazioni globali" @@ -3515,35 +3489,35 @@ msgstr "Senza titolo" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "impostazioni ricerca" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copia valore su tutti gli estrusori" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copia tutti i valori modificati su tutti gli estrusori" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mantieni visibile questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Influenzato da" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Questa impostazione è sempre condivisa tra tutti gli estrusori. La sua modifica varierà il valore per tutti gli estrusori." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Questo valore è risolto da valori per estrusore " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3570,7 @@ msgstr "" "\n" "Fare clic per ripristinare il valore del profilo." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3581,13 @@ msgstr "" "\n" "Fare clic per ripristinare il valore calcolato." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Abilita stampa di brim o raft. Questa funzione aggiunge un’area piana attorno o sotto l’oggetto, facile da tagliare successivamente." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Altezza dello strato" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Sono state modificate alcune impostazioni del profilo. Per modificarle, andare alla modalità personalizzata." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Questo profilo di qualità non è disponibile per la configurazione attuale del materiale e degli ugelli. Modificare tali configurazioni per abilitare il profilo di qualità desiderato." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Un profilo personalizzato è attualmente attivo. Per attivare il cursore qualità, selezionare un profilo di qualità predefinito nella scheda Personalizza" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Disinserita" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Sperimentale" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profilo" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3664,11 @@ msgstr "" "\n" "Fare clic per aprire la gestione profili." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Materiale" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Preferiti" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Generale" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Disabilita estrusore" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Piano di stampa" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profilo" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configurazioni" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Seleziona configurazione" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configurazioni" @@ -3984,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Abilitato" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Materiale" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilizzare la colla per una migliore adesione con questa combinazione di materiali." @@ -4406,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Impostazioni" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Chiusura di Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Sei sicuro di voler uscire da Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Installa il pacchetto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Rilevata la presenza di uno o più file codice G tra i file selezionati. È possibile aprire solo un file codice G alla volta. Se desideri aprire un file codice G, selezionane uno solo." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Aggiungi stampante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Scopri le novità" @@ -4514,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Informazioni su Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versione: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Soluzione end-to-end per la stampa 3D con filamento fuso." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4504,122 @@ msgstr "" "Cura è stato sviluppato da Ultimaker B.V. in cooperazione con la comunità.\n" "Cura è orgogliosa di utilizzare i seguenti progetti open source:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interfaccia grafica utente" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Struttura applicazione" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Generatore codice G" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Libreria di comunicazione intra-processo" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Lingua di programmazione" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Struttura GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Vincoli struttura GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Libreria vincoli C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Formato scambio dati" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Libreria di supporto per calcolo scientifico" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Libreria di supporto per calcolo rapido" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Libreria di supporto per gestione file STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Libreria di supporto per gestione oggetti planari" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Libreria di supporto per gestione maglie triangolari" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Libreria di supporto per l’analisi di reti complesse" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Libreria di supporto per gestione file 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Libreria di supporto per metadati file e streaming" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Libreria di comunicazione seriale" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Libreria scoperta ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Libreria ritaglio poligono" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Libreria Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Font" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Icone SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Apertura applicazione distribuzione incrociata Linux" @@ -4668,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salva progetto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Piano di stampa" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Estrusore %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiale" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Materiale" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Non mostrare il riepilogo di progetto alla ripetizione di salva" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Salva" @@ -4869,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Ricerca e riparazione dei guasti" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nome stampante" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Assegna un nome alla stampante" @@ -4933,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Per iniziare" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Controllo modello" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Scarica contenuto di tutte le impostazioni in un file HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Modalità God" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Aggiornamento firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Crea un profilo appiattito di modifiche di qualità." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Appiattitore di profilo" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Aggiornamento della versione da 3.3 a 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Writer profilo Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Consente ai produttori di materiali di creare nuovi profili materiale e di qualità utilizzando una UI drop-in." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente profilo di stampa" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lettore profilo Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Impostazioni attive profilo appiattito" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Il profilo è stato appiattito e attivato." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Scrive X3g sui file" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "File X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "File X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente profilo" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente profilo" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Riprova" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print Core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Non supporta sovrapposizione con altri modelli" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modifica impostazioni per sovrapposizione con altri modelli" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modifica impostazioni per riempimento di altri modelli" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Aggiorna esistente" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Non supportato" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Precedente" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Suggerimento" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Prova di stampa" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista di controllo" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Seleziona qualsiasi aggiornamento realizzato per questa Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Blocco Olsson" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Rendering fotocamera: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Utilizzare la funzionalità piano di stampa multiplo" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Utilizzare la funzionalità piano di stampa multiplo (necessario riavvio)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Profili predefiniti" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "impostazioni ricerca" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Altezza dello strato" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Questo profilo di qualità non è disponibile per la configurazione attuale del materiale e degli ugelli. Modificare tali configurazioni per abilitare il profilo di qualità desiderato." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Un profilo personalizzato è attualmente attivo. Per attivare il cursore qualità, selezionare un profilo di qualità predefinito nella scheda Personalizza" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Piano di stampa" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profilo" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Piano di stampa" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Scarica contenuto di tutte le impostazioni in un file HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Modalità God" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Crea un profilo appiattito di modifiche di qualità." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Appiattitore di profilo" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Consente ai produttori di materiali di creare nuovi profili materiale e di qualità utilizzando una UI drop-in." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente profilo di stampa" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Collegato alla rete." diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index 457ef557f0..c1df4418a1 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 20e26de47a..3a6f87353e 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Italian , Italian \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Indica il numero degli strati inferiori. Quando calcolato mediante lo spessore dello strato inferiore, il valore viene arrotondato a numero intero." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,9 +1433,7 @@ msgstr "Abilita stiratura" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Andare ancora una volta sulla superficie superiore, questa volta estrudendo una piccolissima quantità di materiale. Lo scopo è quello di sciogliere ulteriormente" -" la plastica sulla parte superiore, creando una superficie più liscia. La pressione nella camera dell'ugello viene mantenuta elevata, in modo che le grinze" -" nella superficie siano riempite con il materiale." +msgstr "Andare ancora una volta sulla superficie superiore, questa volta estrudendo una piccolissima quantità di materiale. Lo scopo è quello di sciogliere ulteriormente la plastica sulla parte superiore, creando una superficie più liscia. La pressione nella camera dell'ugello viene mantenuta elevata, in modo che le grinze nella superficie siano riempite con il materiale." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1710,8 +1718,7 @@ msgstr "Avvio con riempimento casuale" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "Decidere in modo casuale quale sarà la linea di riempimento ad essere stampata per prima. In tal modo si evita che un segmento diventi il più resistente" -" sebbene si esegua uno spostamento aggiuntivo." +msgstr "Decidere in modo casuale quale sarà la linea di riempimento ad essere stampata per prima. In tal modo si evita che un segmento diventi il più resistente sebbene si esegua uno spostamento aggiuntivo." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -3570,9 +3577,7 @@ msgstr "Direzione delle linee di riempimento supporto" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento" -" della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre." -" L’elenco predefinito è vuoto, vale a dire che utilizza l'angolo predefinito di 0 gradi." +msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre. L’elenco predefinito è vuoto, vale a dire che utilizza l'angolo predefinito di 0 gradi." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3986,8 +3991,8 @@ msgstr "Area minima interfaccia supporto" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Dimensioni minime area per i poligoni di interfaccia del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3996,8 +4001,8 @@ msgstr "Area minima parti superiori supporto" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Dimensioni minime area per le parti superiori del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4006,8 +4011,8 @@ msgstr "Area minima parti inferiori supporto" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Dimensioni minime area per le parti inferiori del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4047,10 +4052,7 @@ msgstr "Direzioni della linea dell'interfaccia di supporto" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento" -" della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre." -" L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure" -" 90 gradi)." +msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre. L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure 90 gradi)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4060,10 +4062,7 @@ msgstr "Direzioni delle linee di supporto superiori" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento" -" della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre." -" L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure" -" 90 gradi)." +msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre. L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure 90 gradi)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4073,10 +4072,7 @@ msgstr "Direzioni della larghezza della linea di supporto inferiore" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento" -" della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre." -" L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure" -" 90 gradi)." +msgstr "Elenco di direzioni linee intere da utilizzare. Gli elementi dall'elenco sono utilizzati in sequenza con il progredire dei layers e, al raggiungimento della fine dell'elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l'intero elenco è racchiuso tra parentesi quadre. L'elenco predefinito è vuoto, vale a dire che utilizza gli angoli predefiniti (alterna tra 45 e 135 gradi se le interfacce sono abbastanza spesse oppure 90 gradi)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4802,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Rimuovere gli strati vuoti sotto il primo strato stampato, se presenti. La disabilitazione di questa impostazione può provocare la presenza di primi strati vuoti, se l'impostazione di Tolleranza di sezionamento è impostata su Esclusiva o Intermedia." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Risoluzione massima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "La dimensione minima di un segmento di linea dopo il sezionamento. Se tale dimensione aumenta, la maglia avrà una risoluzione inferiore. Questo può consentire alla stampante di mantenere la velocità per processare il g-code ed aumenterà la velocità di sezionamento eliminando i dettagli della maglia che non è comunque in grado di processare." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Risoluzione massima di spostamento" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "La dimensione minima di un segmento lineare di spostamento dopo il sezionamento. Aumentando tale dimensione, le corse di spostamento avranno meno angoli arrotondati. La stampante può così mantenere la velocità per processare il g-code, ma si può verificare una riduzione della precisione di aggiramento del modello." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Deviazione massima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "La deviazione massima consentita quando si riduce la risoluzione per l'impostazione Risoluzione massima. Se si aumenta questo parametro, la stampa sarà meno precisa, ma il g-code sarà più piccolo. Deviazione massima rappresenta il limite per Risoluzione massima; pertanto se le due impostazioni sono in conflitto, verrà considerata vera l'impostazione Deviazione massima." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5177,38 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "I poligoni in strati sezionati con una circonferenza inferiore a questo valore verranno scartati. I valori inferiori generano una maglia con risoluzione superiore al costo del tempo di sezionamento. È dedicata in particolare alle stampanti SLA ad alta risoluzione e a modelli 3D molto piccoli, ricchi di dettagli." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Risoluzione massima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "La dimensione minima di un segmento di linea dopo il sezionamento. Se tale dimensione aumenta, la maglia avrà una risoluzione inferiore. Questo può consentire alla stampante di mantenere la velocità per processare il g-code ed aumenterà la velocità di sezionamento eliminando i dettagli della maglia che non è comunque in grado di processare." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Risoluzione massima di spostamento" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "La dimensione minima di un segmento lineare di spostamento dopo il sezionamento. Aumentando tale dimensione, le corse di spostamento avranno meno angoli arrotondati. La stampante può così mantenere la velocità per processare il g-code, ma si può verificare una riduzione della precisione di aggiramento del modello." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Deviazione massima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "La deviazione massima consentita quando si riduce la risoluzione per l'impostazione Risoluzione massima. Se si aumenta questo parametro, la stampa sarà" -" meno precisa, ma il g-code sarà più piccolo. Deviazione massima rappresenta il limite per Risoluzione massima; pertanto se le due impostazioni sono in" -" conflitto, verrà considerata vera l'impostazione Deviazione massima." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5349,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "È la velocità a cui eseguire lo spostamento durante il Coasting, rispetto alla velocità del percorso di estrusione. Si consiglia di impostare un valore leggermente al di sotto del 100%, poiché durante il Coasting la pressione nel tubo Bowden scende." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Rotazione alternata del rivestimento esterno" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterna la direzione di stampa degli strati superiori/inferiori. Normalmente vengono stampati solo diagonalmente. Questa impostazione aggiunge le direzioni solo X e solo Y." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5531,23 +5515,23 @@ msgstr "Indica la distanza media tra i punti casuali introdotti su ciascun segme #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Offset massimo dell'estrusione di compensazione del flusso" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "La massima distanza in mm da compensare." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Fattore di compensazione del flusso" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Il fattore di moltiplicazione per il flusso -> traslazione distanza." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5840,13 +5824,13 @@ msgstr "La differenza in altezza dello strato successivo rispetto al precedente. #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Soglia strati adattivi" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Soglia per l’utilizzo o meno di uno strato di dimensioni minori. Questo numero è confrontato al valore dell’inclinazione più ripida di uno strato." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5855,8 +5839,8 @@ msgstr "Angolo parete di sbalzo" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Le pareti che sbalzano oltre questo angolo verranno stampate utilizzando le impostazioni parete di sbalzo. Quando il valore è 90, nessuna parete sarà trattata come sbalzo." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6235,20 +6219,18 @@ msgstr "Velocità dettagli piccole dimensioni" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "I dettagli di piccole dimensioni verranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare in termini di" -" adesione e precisione." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Velocità primo layer" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "I dettagli di piccole dimensioni sul primo layer saranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare" -" in termini di adesione e precisione." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6310,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Dimensioni minime area per i poligoni di interfaccia del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Dimensioni minime area per le parti superiori del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Dimensioni minime area per le parti inferiori del supporto. I poligoni con un’area inferiore a questo valore non verranno generati." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Rotazione alternata del rivestimento esterno" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterna la direzione di stampa degli strati superiori/inferiori. Normalmente vengono stampati solo diagonalmente. Questa impostazione aggiunge le direzioni solo X e solo Y." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Offset massimo dell'estrusione di compensazione del flusso" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "La massima distanza in mm da compensare." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Fattore di compensazione del flusso" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Il fattore di moltiplicazione per il flusso -> traslazione distanza." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Soglia strati adattivi" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Soglia per l’utilizzo o meno di uno strato di dimensioni minori. Questo numero è confrontato al valore dell’inclinazione più ripida di uno strato." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Le pareti che sbalzano oltre questo angolo verranno stampate utilizzando le impostazioni parete di sbalzo. Quando il valore è 90, nessuna parete sarà trattata come sbalzo." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "I dettagli di piccole dimensioni verranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare in termini di adesione e precisione." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Velocità primo layer" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "I dettagli di piccole dimensioni sul primo layer saranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare in termini di adesione e precisione." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Ulteriore passaggio sopra la superficie superiore, senza estrusione di materiale. Ha lo scopo di fondere ulteriormente la plastica alla sommità, creando una superficie più uniforme." diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index bf018e6bc5..4b2c2f4300 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-23 14:15+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Japanese , Japanese \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2.1\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "プリンターの設定" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-codeファイル" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter は非テキストモードはサポートしていません。" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "エクスポートする前にG-codeの準備をしてください。" @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3Dモデルアシスタント" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "ファームウェアアップデート" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "アクティブ設定を平らにします" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "プロファイルが平らになり、アクティベートされました。" - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "現在印刷中" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "X3Gをファイルに書き込む" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3Gファイル" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3Gファイル" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "リムーバブルドライブ{0}に保存することができませんでした: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "エラー" @@ -243,8 +218,8 @@ msgstr "リムーバブルデバイス{0}を取り出す" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "ネットワーク上にて接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "ネットワーク上のプリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "ネットワークのプリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "ネットワーク上で接続" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "印刷エラー" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "GIF画像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "圧縮トライアングルメッシュを開く" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "各モデル構成設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "推奨" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "カスタム" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF ファイル" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "ノズル" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "プロジェクトファイル {0} に不明なマシンタイプ {1} があります。マシンをインポートできません。代わりにモデルをインポートします。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "プロジェクトファイルを開く" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Curaプロファイル" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "プロファイルアシスタント" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "プロファイルアシスタント" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "プレビュー" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "ログインに失敗しました" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "サポート対象外" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "すでに存在するファイルです" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "{0} は既に存在します。ファイルを上書きしますか？" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無効なファイルのURL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "現在利用可能な次のエクストルーダーに合わせて設定が変更されました:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "設定が更新されました" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "エクストルーダーを無効にしました" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "不明" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "{0}にプロファイルを書き出すのに失敗しました: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "{0}にプロファイルを書き出すことに失敗しました。：ライタープラグイン失敗の報告。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "{0}にプロファイルを書き出しました" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "書き出し完了" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0}からプロファイルの取り込に失敗しました:{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "プリンタを追加する前に、{0}からプロファイルの取り込はできません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "ファイル{0}にはカスタムプロファイルがインポートされていません" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0}からプロファイルの取り込に失敗しました:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "このプロファイル{0}には、正しくないデータが含まれているため、インポートできません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "{0}からプロファイルの取り込みに失敗しました:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "プロファイル {0}の取り込み完了" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "ファイル{0}には、正しいプロファイルが含まれていません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "プロファイル{0}は不特定なファイルまたは破損があります。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "カスタムプロファイル" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "プロファイルはクオリティータイプが不足しています。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "他" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "スライス前ファイル {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "次" @@ -962,9 +954,9 @@ msgstr "グループ #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "閉める" @@ -979,40 +971,85 @@ msgstr "追加" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "キャンセル" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "上書きできません" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "カスタムプロファイル" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "すべてのサポートのタイプ ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "全てのファイル" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "不明" +msgid "Custom Material" +msgstr "カスタムフィラメント" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "カスタム" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "ネットワークで利用可能なプリンター" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "カスタムフィラメント" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "カスタム" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker アカウントサーバーに到達できません。" -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "再試行" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "レポート送信" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "プリンターを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "シーンをセットアップ中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "インターフェイスを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一度に一つのG-codeしか読み取れません。{0}の取り込みをスキップしました。" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-codeを読み込み中は他のファイルを開くことができません。{0}の取り込みをスキップしました。" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選択したモデルは読み込むのに小さすぎます。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "プリンターの設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X（幅）" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (奥行き)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高さ)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "ビルドプレート形" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "センターを出します" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "ヒーテッドドベッド" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "加熱式ビルドボリューム" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "G-codeフレーバー" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "プリントヘッド設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X分" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y分" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "最大X" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "最大Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "ガントリーの高さ" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "エクストルーダーの数" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Codeの開始" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-codeの終了" @@ -1477,7 +1503,7 @@ msgstr "プラグイン" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "プリンター" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "プリントコア" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "編集" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "取り除く" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "タイプ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "ファームウェアバージョン" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "アドレス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "このプリンターは、プリンターのグループをホストするために設定されていません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "このプリンターは %1 プリンターのループのホストプリンターです。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "このアドレスのプリンターは応答していません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "無効なIPアドレス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "有効なIPアドレスを入力してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "プリンターアドレス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "ネットワーク内のプリンターのIPアドレスを入力してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%1 を %2 に終了します" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "プリント" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "ネットワーク上のプリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "プリント" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "プリンターの選択" @@ -2423,72 +2444,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "スムージング" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "メッシュタイプ" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "標準モデル" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "サポートとしてプリント" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "他のモデルとのオーバーラップは未サポート" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "他のモデルとのオーバーラップの設定を変更" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "他のモデルのインフィルの設定を変更" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "設定を選択する" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "このモデルをカスタマイズする設定を選択する" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "フィルター…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "すべて表示する" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "メッシュタイプ" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "標準モデル" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "サポートとしてプリント" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "設定を選択する" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "プロジェクトを開く" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "現在のプロファイルに読み込む" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "新しいものを作成する" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2513,6 +2533,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "アップデート" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "新しいものを作成する" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2526,7 +2551,7 @@ msgid "Printer Group" msgstr "プリンターグループ" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "プロファイル設定" @@ -2537,28 +2562,34 @@ msgid "How should the conflict in the profile be resolved?" msgstr "このプロファイルの問題をどのように解決すればいいか？" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "ネーム" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "プロファイル内にない" # Can’t edit the Japanese text -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1個の設定を上書き" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "次から引き出す" @@ -2566,48 +2597,48 @@ msgstr "次から引き出す" # can’t inset the japanese text # %1: print quality profile name # %2: number of overridden ssettings -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%2の%1個の設定を上書き" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "フィラメント設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "このフィラメントの問題をどのように解決すればいいか？" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "視野設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "モード" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "ビジブル設定:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%2のうち%1" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "プロジェクトを読み込むとビルドプレート上のすべてのモデルがクリアされます。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "開く" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Cura を起動した日は常にバックアップを自動生成します。" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "サポート対象外" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "前" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "書き出す" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "ヒント" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "汎用" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "試し印刷" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "チェックリスト" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "このUltimaker2に施したアップグレードを選択してください。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "本当にプリントを中止してもいいですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "インフォメーション" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "直径変更の確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新しいフィラメントの直径は %1 mm に設定されています。これは現在のエクストルーダーに適応していません。続行しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "ディスプレイ名" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "ブランド" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "フィラメントタイプ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "プロパティ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "直径" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "フィラメントコスト" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "フィラメントの重さ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "フィラメントの長さ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "毎メーターコスト" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "このフィラメントは %1にリンクすプロパティーを共有する。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "フィラメントをリンクを外す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "記述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "接着のインフォメーション" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "プリント設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "アクティベート" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "作成する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "書き出す" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "プリンター" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "モデルを取り除きました" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1を取り外しますか？この作業はやり直しが効きません！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "フィラメントを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "%1フィラメントを取り込むことができない: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "フィラメント%1の取り込みに成功しました" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "フィラメントを書き出す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "フィラメントの書き出しに失敗しました %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "フィラメントの%1への書き出しが完了ました" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "全てを調べる" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "計算された" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "現在" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "ユニット" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "一般" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "インターフェイス" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "言語:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "通貨:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "テーマ:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "それらの変更を有効にするためにはアプリケーションを再起動しなけらばなりません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "セッティングを変更すると自動にスライスします。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動的にスライスする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "ビューポイント機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "赤でサポートができないエリアをハイライトしてください。サポートがない場合、正確にプリントができない場合があります。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "ディスプレイオーバーハング" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "モデルの選択時にモデルがカメラの中心に見えるようにカメラを移動する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "アイテムを選択するとカメラが中心にきます" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Curaのデフォルトのズーム機能は変更できるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "カメラのズーム方向を反転する。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "ズームはマウスの方向に動くべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "マウスに対するズームは、正射投影ではサポートされていません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "マウスの方向にズームする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "交差を避けるためにプラットホーム上のモデルを移動するべきですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "モデルの距離が離れているように確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "プラットホーム上のモデルはブルドプレートに触れるように下げるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動的にモデルをビルドプレートに落とす" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-codeリーダーに注意メッセージを表示します。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-codeリーダーに注意メッセージ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "レイヤーはコンパティビリティモードに強制されるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "レイヤービューコンパティビリティモードを強制する。（再起動が必要）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "どのような種類のカメラレンダリングを使用する必要がありますか?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "カメラレンダリング: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "パースペクティブ表示" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "平行投影表示" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "ファイルを開くまた保存" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "モデルがビルドボリュームに対して大きすぎる場合はスケールされるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "大きなモデルをスケールする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "ユニット値がミリメートルではなくメートルの場合、モデルが極端に小さく現れる場合があります。モデルはスケールアップされるべきですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "極端に小さなモデルをスケールアップする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "モデルはロード後に選択しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "ロード後にモデルを選択" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "プリンター名の敬称はプリントジョブの名前に自動的に加えられるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "プリンターの敬称をジョブネームに加える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "プロジェクトファイルを保存時にサマリーを表示するべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "プロジェクトを保存時にダイアログサマリーを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "プロジェクトファイルを開く際のデフォルト機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "プロジェクトファイル開く際のデフォルト機能: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "常にプロジェクトとして開く" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "常にモデルを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "プロファイル内を変更し異なるプロファイルにしました、どこの変更点を保持、破棄したいのダイアログが表示されます、また何度もダイアログが表示されないようにデフォルト機能を選ぶことができます。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "プロファイル交換時に設定値を変更するためのデフォルト処理： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "常に変更した設定を廃棄する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "常に変更した設定を新しいプロファイルに送信する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "プライバシー" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Curaのプログラム開始時にアップデートがあるかチェックしますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "スタート時にアップデートあるかどうかのチェック" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "プリンターの不明なデータをUltimakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(不特定な) プリントインフォメーションを送信" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "詳細" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "実験" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "マルチビルドプレート機能を使用" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "マルチビルドプレート機能を使用 (再起動が必要)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "プリンター" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "名を変える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "作成する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "プロファイルを作る" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "このプロファイルの名前を指定してください。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "プロファイルを複製する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "プロファイル名を変える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "プロファイルを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "プロファイルを書き出す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "プリンター:%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "デフォルトプロファイル" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "カスタムプロファイル" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "プロファイルを現在のセッティング" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "今の変更を破棄する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "このプロファイルはプリンターによりデフォルトを使用、従いこのプロファイルはセッティング/書き換えが以下のリストにありません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "設定は選択したプロファイルにマッチしています。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "グローバル設定" @@ -3515,35 +3489,35 @@ msgstr "無題" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "検索設定" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "すべてのエクストルーダーの値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "すべてのエクストルーダーに対して変更された値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "この設定を非表示にする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "この設定を表示しない" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "常に見えるように設定する" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3574,17 +3548,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "次によって影響を受ける" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "この設定は常に全てのエクストルーダーに共有されています。ここですべてのエクストルーダーの数値を変更できます。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "この値は各エクストルーダーの値から取得します " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3594,7 +3568,7 @@ msgstr "" "この設定にプロファイルと異なった値があります。\n" "プロファイルの値を戻すためにクリックしてください。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3604,6 +3578,12 @@ msgstr "" "このセッティングは通常計算されます、今は絶対値に固定されています。\n" "計算された値に変更するためにクリックを押してください。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3644,26 +3624,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "ブリムまたはラフトのプリントの有効化。それぞれ、プリントの周り、また造形物の下に底面を加え切り取りやすくします。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "レイヤーの高さ" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "プロファイルの設定がいくつか変更されました。変更を有効にするにはカスタムモードに移動してください。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "この品質プロファイルは、現在の材料およびノズル構成では使用できません。この品質プロファイルを有効にするには、これらを変更してください。" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "カスタムプロファイルが有効になっています。品質スライダーを有効にするには、カスタムタブでデフォルトの品質プロファイルを選択してください" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3674,12 +3639,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "オフ" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "実験" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3689,6 +3659,11 @@ msgstr "" "いくらかの設定プロファイルにある値とことなる場合無効にします。\n" "プロファイルマネージャーをクリックして開いてください。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3816,11 +3791,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "お気に入り" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "汎用" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3856,16 +3836,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "エクストルーダーを無効にする" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "ビルドプレート (&B)" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&プロファイル" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3945,12 +3915,12 @@ msgctxt "@header" msgid "Configurations" msgstr "構成" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "構成の選択" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "構成" @@ -3980,12 +3950,12 @@ msgctxt "@label" msgid "Enabled" msgstr "有効" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "フィラメント" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "この材料の組み合わせの接着に接着材を使用する。" @@ -4402,44 +4372,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura を閉じる" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura を終了しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "ファイルを開く" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "パッケージをインストール" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "ファイルを開く(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "選択したファイルの中に複数のG-codeが存在します。1つのG-codeのみ一度に開けます。G-codeファイルを開く場合は、1点のみ選んでください。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "プリンターを追加する" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "新情報" @@ -4508,139 +4478,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Curaについて" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "バージョン: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熱溶解積層型3Dプリンティングのエンドtoエンドソリューション。" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "CuraはUltimakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "グラフィックユーザーインターフェイス" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "アプリケーションフレームワーク" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-codeの生成" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "インタープロセスコミュニケーションライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "プログラミング用語" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUIフレームワーク" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUIフレームワークバインディング" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ バインディングライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "データインターフェイスフォーマット" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "サイエンスコンピューティングを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "ファターマスを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STLファイルを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "平面対象物を操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "参画メッシュを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "複雑なネットワークを分析するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MFファイルを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "ファイルメタデータとストリーミングのためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "シリアルコミュニケーションライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConfディスカバリーライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "ポリゴンクリッピングライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTPライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "フォント" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVGアイコン" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 分散アプリケーションの開発" @@ -4660,32 +4630,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "プロジェクトを保存" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "ビルドプレート" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "エクストルーダー%1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1とフィラメント" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "保存中のプロジェクトサマリーを非表示にする" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "保存" @@ -4861,12 +4826,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "トラブルシューティング" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "プリンター名" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "プリンター名を入力してください" @@ -4925,6 +4890,31 @@ msgctxt "@button" msgid "Get started" msgstr "はじめに" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4985,16 +4975,6 @@ msgctxt "name" msgid "Model Checker" msgstr "モデルチェッカー" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "HTMLファイルに設定内容を放置する。" - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Godモード" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5005,16 +4985,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "ファームウェアアップデーター" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "プロファイルを変更するフラットエンドクオリティーを作成する。" - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "プロファイルフラッター" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5215,6 +5185,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "3.3から3.4にバージョンアップグレート" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5415,16 +5395,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Curaプロファイルライター" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "材料メーカーがドロップインUIを使用して新しい材料と品質のプロファイルを作成できるようにします。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "プリントプロファイルアシスタント" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5465,6 +5435,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Curaプロファイルリーダー" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "アクティブ設定を平らにします" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "プロファイルが平らになり、アクティベートされました。" + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "X3Gをファイルに書き込む" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3Gファイル" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3Gファイル" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "圧縮トライアングルメッシュを開く" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "プロファイルアシスタント" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "プロファイルアシスタント" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "再試行" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "プリントコア" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "他のモデルとのオーバーラップは未サポート" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "他のモデルとのオーバーラップの設定を変更" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "他のモデルのインフィルの設定を変更" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "現在のプロファイルに読み込む" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "サポート対象外" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "前" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "ヒント" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "試し印刷" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "チェックリスト" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "このUltimaker2に施したアップグレードを選択してください。" + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "カメラレンダリング: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "マルチビルドプレート機能を使用" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "マルチビルドプレート機能を使用 (再起動が必要)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "デフォルトプロファイル" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "検索設定" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "レイヤーの高さ" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "この品質プロファイルは、現在の材料およびノズル構成では使用できません。この品質プロファイルを有効にするには、これらを変更してください。" + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "カスタムプロファイルが有効になっています。品質スライダーを有効にするには、カスタムタブでデフォルトの品質プロファイルを選択してください" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "ビルドプレート (&B)" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&プロファイル" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "ビルドプレート" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "HTMLファイルに設定内容を放置する。" + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Godモード" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "プロファイルを変更するフラットエンドクオリティーを作成する。" + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "プロファイルフラッター" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "材料メーカーがドロップインUIを使用して新しい材料と品質のプロファイルを作成できるようにします。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "プリントプロファイルアシスタント" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "ネットワーク上で接続。" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 60e0f20176..61388dc1d1 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 82890ad028..9b4d26c209 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 14:15+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Japanese , Japanese \n" @@ -1073,6 +1073,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "最底面のレイヤー数。下の厚さで計算すると、この値は整数に変換されます。" +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -4096,8 +4106,8 @@ msgstr "最小サポートインターフェイス領域" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "インターフェイスポリゴンをサポートする最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4106,8 +4116,8 @@ msgstr "最小サポートルーフ領域" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "サポートのルーフに対する最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4116,8 +4126,8 @@ msgstr "最小サポートフロア領域" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "サポートのフロアに対する最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4910,6 +4920,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "最初に印刷したレイヤーの下に空のレイヤーがある場合は取り除きます。この設定を無効にすると、スライストレランスが「排他」または「中間」に設定されている場合に最初のレイヤーが空になる原因になります。" +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "最大解像度" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "スライス後の線分の最小サイズ。これを増やすと、メッシュの解像度が低くなります。これにより、プリンタが g コードの処理速度に追いつくことができ、処理できないメッシュの詳細を取り除いてスライス速度を速めます。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "最大移動解像度" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "スライス後の移動線分の最小サイズ。これを増やすと、移動の跡が滑らかでなくなります。これにより、プリンタが g コードの処理速度に追いつくことができますが、精度が低下します。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "最大偏差" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "最大解像度設定の解像度を下げるときに許容される最大偏差です。これを大きくすると印刷の精度は低くなりますが、g-codeは小さくなります。最大偏差は最大解像度の限度であるため、最大偏差でこの2つが競合する場合には常にtrueとなります。" + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5296,36 +5336,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "この量よりも小さい円周を持つスライスレイヤーのポリゴンは、除外されます。値を小さくすると、スライス時間のコストで、メッシュの解像度が高くなります。つまり、ほとんどが高解像 SLA プリンター、極小多機能 3D モデルです。" -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "最大解像度" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "スライス後の線分の最小サイズ。これを増やすと、メッシュの解像度が低くなります。これにより、プリンタが g コードの処理速度に追いつくことができ、処理できないメッシュの詳細を取り除いてスライス速度を速めます。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "最大移動解像度" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "スライス後の移動線分の最小サイズ。これを増やすと、移動の跡が滑らかでなくなります。これにより、プリンタが g コードの処理速度に追いつくことができますが、精度が低下します。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "最大偏差" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "最大解像度設定の解像度を下げるときに許容される最大偏差です。これを大きくすると印刷の精度は低くなりますが、g-codeは小さくなります。最大偏差は最大解像度の限度であるため、最大偏差でこの2つが競合する場合には常にtrueとなります。" - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5469,16 +5479,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "コースティング中の移動速度。印刷時の経路の速度設定に比例します。ボーデンチューブの圧力が低下するので、100％よりわずかに低い値が推奨される。" -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "レイヤー回転変更" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "トップ/ボトムのレイヤーが印刷される方向を変更します。通常、それらは斜めに印刷されます。この設定では、X方向のみとY方向のみが追加されます。" - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5659,23 +5659,23 @@ msgstr "各線分に導入されたランダム点間の平均距離。ポリゴ #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "流量補正時の最大抽出オフセット" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "補正の最大距離をミリ単位で指定します。" +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "流量補正要因" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "流量を距離に変換する際の要因。" +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5966,13 +5966,13 @@ msgstr "次のレイヤーの高さを前のレイヤーの高さと比べた差 #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "適応レイヤーしきい値" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "小さいレイヤーを使用するかどうかの閾値。この値が、レイヤー中の最も急な斜面のタンジェントと比較されます。" +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5981,8 +5981,8 @@ msgstr "張り出し壁アングル" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "この角度以上に張り出した壁は、オーバーハング壁設定を使用して印刷されます。値が 90 の場合は、オーバーハング壁として処理されません。" +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6361,18 +6361,18 @@ msgstr "Small Feature Speed" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "小型形体は通常の印刷速度よりこの割合で印刷されます。低速の印刷によって、接着と精度が向上します。" +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "最初のレイヤー速度" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "小型形体の最初のレイヤーは通常の印刷速度よりこの割合で印刷されます。低速の印刷によって、接着と精度が向上します。" +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6434,6 +6434,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。" +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "インターフェイスポリゴンをサポートする最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "サポートのルーフに対する最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "サポートのフロアに対する最小領域サイズ。この領域よりポリゴンが小さい場合は生成されません。" + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "レイヤー回転変更" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "トップ/ボトムのレイヤーが印刷される方向を変更します。通常、それらは斜めに印刷されます。この設定では、X方向のみとY方向のみが追加されます。" + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "流量補正時の最大抽出オフセット" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "補正の最大距離をミリ単位で指定します。" + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "流量補正要因" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "流量を距離に変換する際の要因。" + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "適応レイヤーしきい値" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "小さいレイヤーを使用するかどうかの閾値。この値が、レイヤー中の最も急な斜面のタンジェントと比較されます。" + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "この角度以上に張り出した壁は、オーバーハング壁設定を使用して印刷されます。値が 90 の場合は、オーバーハング壁として処理されません。" + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "小型形体は通常の印刷速度よりこの割合で印刷されます。低速の印刷によって、接着と精度が向上します。" + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "最初のレイヤー速度" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "小型形体の最初のレイヤーは通常の印刷速度よりこの割合で印刷されます。低速の印刷によって、接着と精度が向上します。" + # msgstr "アイロンを有効にする" #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index a8841db42a..20aa5bb60b 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-23 14:16+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Korean , Jinbum Kim , Korean \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2.1\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "기기 설정" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code 파일" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter는 텍스트가 아닌 모드는 지원하지 않습니다." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "내보내기 전에 G-code를 준비하십시오." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3D 모델 도우미" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "펌웨어 업데이트" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "활성 설정 병합" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "프로파일이 병합되고 활성화되었습니다." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "프린트 진행 중" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "파일에 X3g 쓰기" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g 파일" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 파일" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "이동식 드라이브 {0}: {1} 에 저장할 수 없습니다 :" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "오류" @@ -243,8 +218,8 @@ msgstr "이동식 장치 {0} 꺼내기" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "경고" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "네트워크를 통해 연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "네트워크를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "네트워크를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "네트워크를 통해 연결됨" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "프린트 오류" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "GIF 이미지" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "모델 별 설정 구성" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "추천" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "사용자 정의" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 파일" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "노즐" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "프로젝트 파일 {0}에 알 수 없는 기기 유형 {1}이(가) 포함되어 있습니다. 기기를 가져올 수 없습니다. 대신 모델을 가져옵니다." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "프로젝트 파일 열기" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 프로파일" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "프로파일 어시스턴트" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "프로파일 어시스턴트" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "미리 보기" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "로그인 실패" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "지원되지 않음" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "파일이 이미 있습니다" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "파일 {0}이 이미 있습니다. 덮어 쓰시겠습니까?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "유효하지 않은 파일 URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "익스트루더의 현재 가용성과 일치하도록 설정이 변경되었습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "설정이 업데이트되었습니다" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "익스트루더 비활성화됨" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "알 수 없는" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "프로파일을 {0}: {1}로 내보내는데 실패했습니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "프로파일을 {0}로 내보내지 못했습니다. Writer 플러그인이 오류를 보고했습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "프로파일을 {0} 에 내보냅니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "내보내기 완료" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0}에서 프로파일을 가져오지 못했습니다 {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "프린터가 추가되기 전 {0}에서 프로파일을 가져올 수 없습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "{0}(으)로 가져올 사용자 정의 프로파일이 없습니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0}에서 프로파일을 가져오지 못했습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "프로파일 {0}에는 정확하지 않은 데이터가 포함되어 있으므로, 불러올 수 없습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "{0}에서 프로파일을 가져오지 못했습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "프로파일 {0}을 성공적으로 가져 왔습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "파일 {0}에 유효한 프로파일이 포함되어 있지 않습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "프로파일 {0}에 알 수 없는 파일 유형이 있거나 손상되었습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "사용자 정의 프로파일" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "프로파일에 품질 타입이 누락되었습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "다른" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "미리 슬라이싱한 파일 {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "다음" @@ -962,9 +954,9 @@ msgstr "그룹 #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "닫기" @@ -979,40 +971,85 @@ msgstr "추가" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "취소" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "재정의되지 않음" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "사용자 정의 프로파일" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "지원되는 모든 유형 ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "모든 파일 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "알 수 없는" +msgid "Custom Material" +msgstr "사용자 정의 소재" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "사용자 정의" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "사용 가능한 네트워크 프린터" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "사용자 정의 소재" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "사용자 정의" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker 계정 서버에 도달할 수 없음." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "재시도" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "보고서 전송" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "기기로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "장면 설정 중..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "인터페이스 로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "한 번에 하나의 G-코드 파일만 로드 할 수 있습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-코드가 로드되어 있으면 다른 파일을 열 수 없습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "선택한 모델이 너무 작아서 로드할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "프린터 설정" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (너비)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (깊이)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (높이)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "빌드 플레이트 모양" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "중앙이 원점" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "히트 베드" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "히팅 빌드 사이즈" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Gcode 유형" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "프린트헤드 설정" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X 최소값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y 최소값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X 최대값" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y 최대값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "갠트리 높이" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "익스트루더의 수" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "시작 GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "End GCode" @@ -1477,7 +1503,7 @@ msgstr "플러그인" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "기기" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "프린트 코어" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "편집" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "제거" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "유형" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "펌웨어 버전" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "주소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "이 프린터는 프린터 그룹을 호스트하도록 설정되어 있지 않습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "이 프린터는 %1개 프린터 그룹의 호스트입니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "이 주소의 프린터가 아직 응답하지 않았습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "잘못된 IP 주소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "유효한 IP 주소를 입력하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "프린터 주소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "네트워크에 있는 프린터의 IP 주소를 입력하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%2에서 %1 완료" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "프린트" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "네트워크를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "프린트" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "프린터 선택" @@ -2422,72 +2443,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "스무딩(smoothing)" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "메쉬 유형" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "일반 모델" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "서포터로 프린팅" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "다른 모델과 오버랩되도록 지원하지 않음" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "다른 모델과의 오버랩에 대한 설정 수정" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "다른 모델의 내부채움에 대한 설정 수정" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "설정 선택" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "이 모델에 맞게 사용자 정의 설정을 선택하십시오" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "필터..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "모두 보이기" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "메쉬 유형" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "일반 모델" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "서포터로 프린팅" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "설정 선택" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "프로젝트 열기" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "기존 업데이트" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "새로 만들기" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2512,6 +2532,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "업데이트" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "새로 만들기" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2525,7 +2550,7 @@ msgid "Printer Group" msgstr "프린터 그룹" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "프로파일 설정" @@ -2536,73 +2561,79 @@ msgid "How should the conflict in the profile be resolved?" msgstr "프로파일의 충돌을 어떻게 해결해야합니까?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "이름" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "프로파일에 없음" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 무시" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivative from" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 무시" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "재료 설정" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "재료의 충돌은 어떻게 해결되어야합니까?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "표시 설정" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "종류" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "표시 설정 :" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "1 out of %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "프로젝트를 로드하면 빌드 플레이트의 모든 모델이 지워집니다." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "열기" @@ -2709,54 +2740,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Cura가 시작되는 날마다 자동으로 백업을 생성하십시오." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "지원되지 않음" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "이전" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "내보내기" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "팁" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "일반" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "인쇄 실험" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "체크리스트" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "이 Ultimaker 2 업그레이드를 선택하십시오." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2842,170 +2825,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "프린팅를 중단 하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "직경 변경 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "새 필라멘트의 직경은 %1 mm로 설정되었으며, 현재 압출기와 호환되지 않습니다. 계속하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "표시 이름" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "상표" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "재료 유형" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "색깔" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "속성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "밀도" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "직경" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "필라멘트 비용" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "필라멘트 무게" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "필라멘트 길이" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "미터 당 비용" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "이 재료는 %1에 연결되어 있으며 일부 속성을 공유합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "재료 연결 해제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "설명" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "접착 정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "프린팅 설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "활성화" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "생성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "복제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "가져오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "내보내기" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "프린터" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "제거 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1을 제거 하시겠습니까? 이것은 취소 할 수 없습니다!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "재료 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "재료를 가져올 수 없습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "재료를 성공적으로 가져왔습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "재료 내보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "재료를 내보내는데 실패했습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "재료를 성공적으로 내보냈습니다" @@ -3020,27 +3009,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "모두 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "계산된" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "현재 설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "단위" @@ -3051,307 +3040,301 @@ msgctxt "@title:tab" msgid "General" msgstr "일반" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "인터페이스" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "언어:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "통화:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "테마:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "이러한 변경 사항을 적용하려면 응용 프로그램을 다시 시작해야합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "설정이 변경되면 자동으로 슬라이싱 합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "자동으로 슬라이싱" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "뷰포트 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "지원되지 않는 모델 영역을 빨간색으로 강조 표시하십시오. 서포트가 없으면 이 영역이 제대로 프린팅되지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "오버행 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "모델을 선택하면 모델이 뷰의 가운데에 오도록 카메라를 이동합니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "항목을 선택하면 카메라를 중앙에 위치" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "큐라의 기본 확대 동작을 반전시켜야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "카메라 줌의 방향을 반전시키기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "확대가 마우스 방향으로 이동해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "정투영법 시점에서는 마우스 방향으로 확대가 지원되지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "마우스 방향으로 확대" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "모델을 더 이상 교차시키지 않도록 이동해야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "모델이 분리되어 있는지 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "모델을 빌드 플레이트에 닿도록 아래로 움직여야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "모델을 빌드 플레이트에 자동으로 놓기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "g-code 리더에 주의 메시지를 표시하기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "g-code 리더의 주의 메시지" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "레이어가 호환 모드로 강제 설정되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "레이어 뷰 호환성 모드로 전환 (다시 시작해야 함)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "어떤 유형의 카메라 렌더링을 사용해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "카메라 렌더링: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "원근" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "정투영" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "파일 열기 및 저장" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "크기가 너무 큰 경우 모델을 빌드 볼륨에 맞게 조정해야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "큰 모델의 사이즈 수정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "단위가 밀리미터가 아닌 미터 단위 인 경우 모델이 매우 작게 나타날 수 있습니다. 이 모델을 확대할까요?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "매우 작은 모델의 크기 조정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "모델을 로드한 후에 선택해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "로드된 경우 모델 선택" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "프린터 이름에 기반한 접두어가 프린팅 작업 이름에 자동으로 추가되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "작업 이름에 기기 접두어 추가" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "프로젝트 파일을 저장할 때 요약이 표시되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "프로젝트 저장시 요약 대화 상자 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "프로젝트 파일을 열 때 기본 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "프로젝트 파일을 열 때 기본 동작 " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "항상 프로젝트로 열기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "항상 모델 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "프로파일을 변경하고 다른 프로파일로 전환하면 수정 사항을 유지할지 여부를 묻는 대화 상자가 표시됩니다. 기본 행동을 선택하면 해당 대화 상자를 다시 표시 하지 않을 수 있습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "다른 프로파일로 변경하는 경우 변경된 설정값에 대한 기본 동작 " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "항상 변경된 설정 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "항상 변경된 설정을 새 프로파일로 전송" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "보안" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura가 프로그램이 시작될 때 업데이트를 확인할까요?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "시작시 업데이트 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "프린터에 대한 익명의 데이터를 Ultimaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(익명) 프린터 정보 보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "추가 정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "실험적 설정" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "다수의 빌드 플레이트 사용하기" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "다수의 빌드 플레이트 사용하기(다시 시작해야 합니다)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3359,93 +3342,84 @@ msgid "Printers" msgstr "프린터" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "이름 바꾸기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "생성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "복제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "프로파일 생성하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "이 프로파일에 대한 이름을 제공하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "프로파일 복제하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "프로파일 이름 바꾸기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "프로파일 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "프로파일 내보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "프린터: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "기본 프로파일" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "사용자 정의 프로파일" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "현재 설정 / 재정의 프로파일 업데이트" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "현재 변경 사항 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "이 프로파일은 프린터에서 지정한 기본값을 사용하므로 아래 목록에 아무런 설정/재정의가 없습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "현재 설정이 선택한 프로파일과 일치합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "전역 설정" @@ -3510,35 +3484,35 @@ msgstr "제목 없음" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "검색 설정" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "모든 익스트루더에 값 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "변경된 사항을 모든 익스트루더에 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "이 설정 숨기기" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "이 설정을 표시하지 않음" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "이 설정을 계속 표시하십시오" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3570,17 +3544,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "영향을 받다" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "이 설정은 항상 모든 익스트루더 사이에 공유됩니다. 여기서 변경하면 모든 익스트루더에 대한 값이 변경됩니다." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "이 값은 익스트루더마다 결정됩니다 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3591,7 +3565,7 @@ msgstr "" "\n" "프로파일 값을 복원하려면 클릭하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3602,6 +3576,12 @@ msgstr "" "\n" "계산 된 값을 복원하려면 클릭하십시오." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3642,26 +3622,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "브림이나 라프트를 사용합니다. 이렇게하면 출력물 주변이나 아래에 평평한 영역이 추가되어 나중에 쉽게 자를 수 있습니다." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "레이어 높이" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "일부 프로파일 설정을 수정했습니다. 이러한 설정을 변경하려면 사용자 지정 모드로 이동하십시오." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "현재 재료 및 노즐 구성에 대해 이 품질 프로파일을 사용할 수 없습니다. 이 품질 프로파일을 활성화하려면 이를 변경하십시오." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "사용자 지정 프로파일이 현재 활성 상태입니다. 품질 슬라이더를 실행하려면 사용자 지정 탭에서 기본 품질 프로파일을 선택하십시오" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3672,12 +3637,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "비활성" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "실험적 설정" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3688,6 +3658,11 @@ msgstr "" "\n" "프로파일 매니저를 열려면 클릭하십시오." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3815,11 +3790,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "재료" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "즐겨찾기" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "일반" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3855,16 +3835,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "익스트루더 사용하지 않음" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "빌드 플레이트(&B)" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "프로파일(&P)" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3942,12 +3912,12 @@ msgctxt "@header" msgid "Configurations" msgstr "구성" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "구성 선택" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "구성" @@ -3977,12 +3947,12 @@ msgctxt "@label" msgid "Enabled" msgstr "실행됨" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "재료" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "더 나은 접착력을 위해 이 재료 조합과 함께 접착제를 사용하십시오.." @@ -4396,44 +4366,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "설정" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura 닫기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura를 정말로 종료하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "패키지 설치" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "선택한 파일 내에 하나 이상의 G-코드 파일이 있습니다. 한 번에 하나의 G-코드 파일 만 열 수 있습니다. G-코드 파일을 열려면 하나만 선택하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "프린터 추가" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "새로운 기능" @@ -4503,17 +4473,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Cura 소개" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "버전: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "3D 프린팅을 위한 엔드 투 엔트 솔루션." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4522,122 +4492,122 @@ msgstr "" "Cura는 커뮤니티와 공동으로 Ultimaker B.V.에 의해 개발되었습니다.\n" "Cura는 다음의 오픈 소스 프로젝트를 사용합니다:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "그래픽 사용자 인터페이스" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "애플리케이션 프레임 워크" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "GCode 생성기" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "프로세스간 통신 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "프로그래밍 언어" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI 프레임 워크" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 프레임 워크 바인딩" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C ++ 바인딩 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "데이터 교환 형식" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "과학 컴퓨팅을 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "더 빠른 수학연산을 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL 파일 처리를 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "평면 개체 처리를 위한 지원 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "삼각형 메쉬 처리를 위한 지원 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "복잡한 네트워크 분석을 위한 지원 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MF 파일 처리를 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "파일 메타데이터 및 스트리밍을 위한 지원 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "직렬 통신 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf discovery 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "다각형 클리핑 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "폰트" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG 아이콘" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 교차 배포 응용 프로그램 배포" @@ -4657,32 +4627,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "프로젝트 저장" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "빌드 플레이트" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "%1익스트루더" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 재료" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "재료" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "프로젝트 요약을 다시 저장하지 마십시오" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "저장" @@ -4858,12 +4823,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "문제 해결" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "프린터 이름" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "프린터의 이름을 설정하십시오" @@ -4920,6 +4885,31 @@ msgctxt "@button" msgid "Get started" msgstr "시작하기" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4980,16 +4970,6 @@ msgctxt "name" msgid "Model Checker" msgstr "모델 검사기" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "모든 설정의 내용을 HTML 파일로 덤프하십시오." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "God 모드" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5000,16 +4980,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "펌웨어 업데이터" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "평평한 품질 변경 프로필을 만듭니다." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "프로필 플래트너" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5210,6 +5180,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "버전 업그레이드 3.3에서 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5410,16 +5390,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 프로파일 작성자" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "재료 제조사가 드롭 인 UI를 사용하여 새로운 재료와 품질 프로파일을 만들 수 있게 합니다." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "프린트 프로파일 어시스턴트" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5460,6 +5430,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 프로파일 리더" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "활성 설정 병합" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "프로파일이 병합되고 활성화되었습니다." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "파일에 X3g 쓰기" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g 파일" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G 파일" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "프로파일 어시스턴트" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "프로파일 어시스턴트" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "재시도" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "프린트 코어" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "다른 모델과 오버랩되도록 지원하지 않음" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "다른 모델과의 오버랩에 대한 설정 수정" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "다른 모델의 내부채움에 대한 설정 수정" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "기존 업데이트" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "지원되지 않음" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "이전" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "팁" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "인쇄 실험" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "체크리스트" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "이 Ultimaker 2 업그레이드를 선택하십시오." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "카메라 렌더링: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "다수의 빌드 플레이트 사용하기" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "다수의 빌드 플레이트 사용하기(다시 시작해야 합니다)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "기본 프로파일" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "검색 설정" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "레이어 높이" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "현재 재료 및 노즐 구성에 대해 이 품질 프로파일을 사용할 수 없습니다. 이 품질 프로파일을 활성화하려면 이를 변경하십시오." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "사용자 지정 프로파일이 현재 활성 상태입니다. 품질 슬라이더를 실행하려면 사용자 지정 탭에서 기본 품질 프로파일을 선택하십시오" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "빌드 플레이트(&B)" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "프로파일(&P)" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "빌드 플레이트" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "모든 설정의 내용을 HTML 파일로 덤프하십시오." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "God 모드" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "평평한 품질 변경 프로필을 만듭니다." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "프로필 플래트너" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "재료 제조사가 드롭 인 UI를 사용하여 새로운 재료와 품질 프로파일을 만들 수 있게 합니다." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "프린트 프로파일 어시스턴트" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "네트워크를 통해 연결됨." diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index 3f3a8596d1..0d7374d265 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Korean \n" "Language-Team: Jinbum Kim , Korean \n" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index fed3ac8f5a..7f191e0d3a 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Korean , Jinbum Kim , Korean \n" @@ -1031,6 +1031,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "아래층의 수. 바닥 두께로 계산을 할때 이 값은 벽 두께로 계산할 때 이 값은 반올림됩니다." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3982,8 +3992,8 @@ msgstr "최소 서포트 인터페이스 지역" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "지원 인터페이스 영역에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3992,8 +4002,8 @@ msgstr "최소 서포트 지붕 지역" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "서포트 지붕에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4002,8 +4012,8 @@ msgstr "최소 서포트 바닥 지역" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "서포트 바닥에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4043,8 +4053,7 @@ msgstr "서포트 인터페이스 선 방향" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가" -" 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." +msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4054,8 +4063,7 @@ msgstr "서포트 지붕 선 방향" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가" -" 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." +msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4065,8 +4073,7 @@ msgstr "바닥 지붕 선 방향" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가" -" 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." +msgstr "사용할 정수 선 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록입니다. 즉 기본 각도인 0도를 사용합니다(인터페이스가 상당히 두껍거나 90도라면 45도와 135도를 번갈아 사용)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4792,6 +4799,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "첫 번째로 프린팅된 레이어 바로 아래의 비어 있는 레이어를 제거합니다. 이 설정을 해제하면 슬라이싱 허용 오차 설정을 배타 또는 중간으로 설정할 경우 첫 번째 레이어가 비어 있게 될 수 있습니다." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "최대 해상도" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "슬라이딩 후의 선분의 최소 크기입니다. 이 값을 높이면 메쉬의 해상도가 낮아집니다. 그러면 프린터가 G 코드를 처리하는 데 필요한 속도를 유지할 수 있으며 처리할 수 없는 메쉬의 디테일이 제거되므로 슬라이드 속도가 높아집니다." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "최대 이동 해상도" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "슬라이딩 후의 이동 선분의 최소 크기입니다. 이 값을 높이면 코너에서 매끄럽게 이동하는 정도가 감소합니다. 프린터가 G 코드를 처리하는 데 필요한 속도를 유지할 수 있지만, 모델을 피하기 때문에 정확도가 감소합니다." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "최대 편차" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "최대 해상도 설정에 대한 해상도를 낮추면 최대 편차를 사용할 수 있습니다. 최대 편차를 높이면 프린트의 정확도는 감소하지만, G 코드도 감소합니다. 최대 편차는 최대 해상도의 한계이며, 따라서 두 항목이 충돌하면 항상 최대 편차가 우선합니다." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5167,36 +5204,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "레이어가 슬라이스 된, 이 값보다 둘레가 작은 다각형은 필터링됩니다. 값을 낮을수록 슬라이스가 느려지지만, 해상도 메쉬가 높아집니다. 주로 고해상도 SLA 프린터 및 세부 사항이 많은 매우 작은 3D 모델에 적합합니다." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "최대 해상도" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "슬라이딩 후의 선분의 최소 크기입니다. 이 값을 높이면 메쉬의 해상도가 낮아집니다. 그러면 프린터가 G 코드를 처리하는 데 필요한 속도를 유지할 수 있으며 처리할 수 없는 메쉬의 디테일이 제거되므로 슬라이드 속도가 높아집니다." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "최대 이동 해상도" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "슬라이딩 후의 이동 선분의 최소 크기입니다. 이 값을 높이면 코너에서 매끄럽게 이동하는 정도가 감소합니다. 프린터가 G 코드를 처리하는 데 필요한 속도를 유지할 수 있지만, 모델을 피하기 때문에 정확도가 감소합니다." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "최대 편차" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "최대 해상도 설정에 대한 해상도를 낮추면 최대 편차를 사용할 수 있습니다. 최대 편차를 높이면 프린트의 정확도는 감소하지만, G 코드도 감소합니다. 최대 편차는 최대 해상도의 한계이며, 따라서 두 항목이 충돌하면 항상 최대 편차가 우선합니다." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5337,16 +5344,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "코스팅(Coasting)시 이동 속도. 압출 경로의 속도에 상대적입니다. 코스팅(Coasting) 이동 중에 보우 덴 튜브의 압력이 떨어지기 때문에 100% 보다 약간 작은 값을 권합니다." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "대체 스킨 회전" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "위쪽/아래쪽 레이어가 프린팅되는 방향을 바꿉니다. 보통 대각선으로 만 프린팅됩니다. 이 설정은 X 전용 및 Y 전용 방향을 추가합니다." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5519,23 +5516,23 @@ msgstr "각 선분에 있는 임의의 점 사이의 평균 거리입니다. 다 #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "압출 속도 보상 최대 압출 오프셋" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "최대 보상 거리입니다(단위: mm)." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "압출 속도 보상 배율" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "압출 속도를 거리로 변환하는 증배율입니다." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5826,13 +5823,13 @@ msgstr "이전 높이와 비교되는 다음 레이어 높이의 차이." #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "어댑티브 레이어 임계 값" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "더 작은 레이어를 사용할지 여부에 대한 임계 값. 이 숫자는 레이어의 가장 급한 경사의 탄젠트와 비교됩니다." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5841,8 +5838,8 @@ msgstr "오버행된 벽 각도" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "이 각도를 초과해 오버행된 벽은 오버행된 벽 설정을 사용해 인쇄됩니다. 값이 90인 경우 벽이 오버행된 것으로 간주하지 않습니다." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6221,18 +6218,18 @@ msgstr "소형 피처 속도" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 착력과 정확도가 개선됩니다." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "첫 번째 레이어 속도" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "첫 번째 레이어의 소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 접착력과 정확도가 개선됩니다." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6294,6 +6291,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "지원 인터페이스 영역에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "서포트 지붕에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "서포트 바닥에 대한 최소 지역 크기. 이 값보다 작은 지역을 갖는 영역은 생성되지 않습니다." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "대체 스킨 회전" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "위쪽/아래쪽 레이어가 프린팅되는 방향을 바꿉니다. 보통 대각선으로 만 프린팅됩니다. 이 설정은 X 전용 및 Y 전용 방향을 추가합니다." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "압출 속도 보상 최대 압출 오프셋" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "최대 보상 거리입니다(단위: mm)." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "압출 속도 보상 배율" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "압출 속도를 거리로 변환하는 증배율입니다." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "어댑티브 레이어 임계 값" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "더 작은 레이어를 사용할지 여부에 대한 임계 값. 이 숫자는 레이어의 가장 급한 경사의 탄젠트와 비교됩니다." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "이 각도를 초과해 오버행된 벽은 오버행된 벽 설정을 사용해 인쇄됩니다. 값이 90인 경우 벽이 오버행된 것으로 간주하지 않습니다." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 착력과 정확도가 개선됩니다." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "첫 번째 레이어 속도" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "첫 번째 레이어의 소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 접착력과 정확도가 개선됩니다." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "상단 표면을 한 번 더 이동하지만 재료를 익스트루딩 시키지 않습니다. 이것은 맨 위의 플라스틱을 녹여 부드러운 표면을 만듭니다." diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 3059e4aa1d..074f67cd93 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Dutch , Dutch \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Machine-instellingen" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code-bestand" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ondersteunt geen non-tekstmodus." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Bereid voorafgaand aan het exporteren G-code voor." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3D-modelassistent" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware bijwerken" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Actieve instellingen platmaken" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Profiel is platgemaakt en geactiveerd." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Bezig met printen" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Schrijft X3g naar bestanden" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g-bestand" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-bestand" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Kan niet opslaan op verwisselbaar station {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Fout" @@ -243,8 +218,8 @@ msgstr "Verwisselbaar station {0} uitwerpen" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Waarschuwing" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Verbinding Maken via Netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Printen via netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Printen via netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Via het netwerk verbonden" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Printfout" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "GIF-afbeelding" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Gecomprimeerde driehoeksnet openen" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Instellingen per Model configureren" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Aanbevolen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Aangepast" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-bestand" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projectbestand {0} bevat een onbekend type machine {1}. Kan de machine niet importeren. In plaats daarvan worden er modellen geïmporteerd." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Projectbestand Openen" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiel" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profielassistent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profielassistent" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Voorbeeld" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Inloggen mislukt" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Niet ondersteund" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Het Bestand Bestaat Al" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Het bestand {0} bestaat al. Weet u zeker dat u dit bestand wilt overschrijven?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ongeldige bestands-URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "De instellingen zijn gewijzigd zodat deze overeenkomen met de huidige beschikbaarheid van extruders:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "De instellingen zijn bijgewerkt" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(s) uitgeschakeld" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Onbekend" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Kan het profiel niet exporteren als {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Kan het profiel niet exporteren als {0}: Invoegtoepassing voor de schrijver heeft een fout gerapporteerd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Het profiel is geëxporteerd als {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "De export is voltooid" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Kan het profiel niet importeren uit {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Kan het profiel niet importeren uit {0} voordat een printer toegevoegd is." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Er is geen aangepast profiel om in het bestand {0} te importeren" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Dit profiel {0} bevat incorrecte gegevens. Kan het profiel niet importeren." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Het profiel {0} is geïmporteerd" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Het bestand {0} bevat geen geldig profiel." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Het profiel {0} heeft een onbekend bestandstype of is beschadigd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Aangepast profiel" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Er ontbreekt een kwaliteitstype in het profiel." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Overig(e)" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Vooraf geslicet bestand {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Volgende" @@ -962,9 +954,9 @@ msgstr "Groepsnummer {group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Sluiten" @@ -979,40 +971,85 @@ msgstr "Toevoegen" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Annuleren" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Niet overschreven" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Aangepaste profielen" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Alle Ondersteunde Typen ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Bestanden (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Onbekend" +msgid "Custom Material" +msgstr "Aangepast materiaal" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Aangepast" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Beschikbare netwerkprinters" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Aangepast materiaal" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Aangepast" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Kan de Ultimaker-accountserver niet bereiken." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Opnieuw proberen" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapport verzenden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Machines laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Scene instellen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Interface laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Er kan slechts één G-code-bestand tegelijkertijd worden geladen. Het importeren van {0} is overgeslagen" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Kan geen ander bestand openen als G-code wordt geladen. Het importeren van {0} is overgeslagen" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Het geselecteerde model is te klein om te laden." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Printerinstellingen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Breedte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Diepte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Hoogte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Vorm van het platform" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Centraal oorsprongpunt" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Verwarmd bed" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Verwarmde werkvolume" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Versie G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Printkopinstellingen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X max" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Rijbrughoogte" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Aantal extruders" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Eind G-code" @@ -1477,7 +1503,7 @@ msgstr "Invoegtoepassingen" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Machine" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Bewerken" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Verwijderen" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Firmwareversie" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Deze printer is niet ingesteld voor het hosten van een groep printers." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Deze printer is de host voor een groep van %1 printers." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "De printer op dit adres heeft nog niet gereageerd." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Verbinden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ongeldig IP-adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Voer een geldig IP-adres in." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Printeradres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Voer het IP-adres van uw printer in het netwerk in." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Voltooit %1 om %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Printen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Printen via netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Printen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Printerselectie" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Effenen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Rastertype" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Normaal model" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Printen als supportstructuur" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Supportstructuur niet laten overlappen met andere modellen" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Instellingen aanpassen voor overlapping met andere modellen" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Instellingen aanpassen voor vulling van andere modellen" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Instellingen selecteren" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Instellingen Selecteren om Dit Model Aan te Passen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filteren..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Alles weergeven" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Rastertype" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Normaal model" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Printen als supportstructuur" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Instellingen selecteren" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Project openen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Bestaand(e) bijwerken" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Nieuw maken" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Bijwerken" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Nieuw maken" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "Printergroep" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profielinstellingen" @@ -2539,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Hoe dient het conflict in het profiel te worden opgelost?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Naam" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Niet in profiel" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 overschrijving" msgstr[1] "%1 overschrijvingen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Afgeleide van" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 overschrijving" msgstr[1] "%1, %2 overschrijvingen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Materiaalinstellingen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Hoe dient het materiaalconflict te worden opgelost?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Zichtbaarheid instellen" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modus" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Zichtbare instellingen:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 van %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Als u een project laadt, worden alle modellen van het platform gewist." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Openen" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Maak elke dag dat Cura wordt gestart, automatisch een back-up." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Niet ondersteund" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Vorige" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exporteren" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Tip" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Standaard" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Print experiment" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Checklist" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Selecteer eventuele upgrades die op deze Ultimaker 2 zijn uitgevoerd." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson-blok" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Weet u zeker dat u het printen wilt afbreken?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informatie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Diameterwijziging bevestigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Het nieuwe filament is ingesteld op %1 mm. Dit is niet compatibel met de huidige extruder. Wilt u verder gaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Naam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Merk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Type Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Kleur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Eigenschappen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Dichtheid" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diameter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Kostprijs Filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Gewicht filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Lengte filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Kostprijs per meter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Dit materiaal is gekoppeld aan %1 en deelt hiermee enkele eigenschappen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Materiaal ontkoppelen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Beschrijving" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Gegevens Hechting" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Instellingen voor printen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exporteren" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Printer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Verwijderen Bevestigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Weet u zeker dat u %1 wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Materiaal Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Kon materiaal %1 niet importeren: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaal %1 is geïmporteerd" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Materiaal Exporteren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exporteren van materiaal naar %1 is mislukt: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaal is geëxporteerd naar %1" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Alles aanvinken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Berekend" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Instelling" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profiel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Huidig" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Eenheid" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Algemeen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Taal:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "U moet de toepassing opnieuw starten voordat deze wijzigingen van kracht worden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Automatisch slicen bij wijzigen van instellingen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch slicen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Gedrag kijkvenster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Geef niet-ondersteunde gedeelten van het model een rode markering. Zonder ondersteuning zullen deze gedeelten niet goed worden geprint." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Overhang weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Verplaatst de camera zodanig dat wanneer een model wordt geselecteerd, het model in het midden van het beeld wordt weergegeven" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Camera centreren wanneer een item wordt geselecteerd" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Moet het standaard zoomgedrag van Cura worden omgekeerd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Keer de richting van de camerazoom om." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Moet het zoomen in de richting van de muis gebeuren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Zoomen in de richting van de muis wordt niet ondersteund in het orthografische perspectief." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomen in de richting van de muis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Moeten modellen op het platform zodanig worden verplaatst dat ze elkaar niet meer doorsnijden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellen gescheiden houden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Moeten modellen in het printgebied omlaag worden gebracht zodat ze het platform raken?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modellen automatisch op het platform laten vallen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Toon het waarschuwingsbericht in de G-code-lezer." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Waarschuwingsbericht in de G-code-lezer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Moet de laag in de compatibiliteitsmodus worden geforceerd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Compatibiliteitsmodus voor laagweergave forceren (opnieuw opstarten vereist)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Welk type cameraweergave moet worden gebruikt?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Cameraweergave: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspectief" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Orthografisch" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Bestanden openen en opslaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Moeten modellen worden geschaald naar het werkvolume als ze te groot zijn?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Grote modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Een model wordt mogelijk extreem klein weergegeven als de eenheden bijvoorbeeld in meters zijn in plaats van in millimeters. Moeten dergelijke modellen worden opgeschaald?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extreem kleine modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Moeten modellen worden geselecteerd nadat ze zijn geladen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modellen selecteren wanneer ze geladen zijn" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Moet er automatisch een op de printernaam gebaseerde voorvoegsel aan de naam van de printtaak worden toegevoegd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Machinevoorvoegsel toevoegen aan taaknaam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Dient er een samenvatting te worden weergegeven wanneer een projectbestand wordt opgeslagen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialoogvenster voor samenvatting weergeven tijdens het opslaan van een project" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standaardgedrag tijdens het openen van een projectbestand" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standaardgedrag tijdens het openen van een projectbestand: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Altijd als project openen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Altijd modellen importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wanneer u wijzigingen hebt aangebracht aan een profiel en naar een ander profiel wisselt, wordt een dialoogvenster weergegeven waarin u wordt gevraagd of u de aanpassingen wilt behouden. U kunt ook een standaardgedrag kiezen en het dialoogvenster nooit meer laten weergeven." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standaardgedrag voor gewijzigde instellingen wanneer er naar een ander profiel wordt overgeschakeld: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Gewijzigde instellingen altijd verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Gewijzigde instellingen altijd naar nieuw profiel overbrengen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Moet Cura op updates controleren wanneer het programma wordt gestart?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bij starten op updates controleren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Mogen anonieme gegevens over uw print naar Ultimaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare gegevens verzonden of opgeslagen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonieme) printgegevens verzenden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Meer informatie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimenteel" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Functionaliteit voor meerdere platformen gebruiken" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Functionaliteit voor meerdere platformen gebruiken (opnieuw opstarten vereist)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "Printers" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Hernoemen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Profiel Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geef een naam op voor dit profiel." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profiel Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profiel Hernoemen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiel Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiel Exporteren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Printer: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Standaardprofielen" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Aangepaste profielen" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profiel bijwerken met huidige instellingen/overschrijvingen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Huidige wijzigingen verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dit profiel gebruikt de standaardinstellingen die door de printer zijn opgegeven, dus er zijn hiervoor geen instellingen/overschrijvingen in de onderstaande lijst." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Uw huidige instellingen komen overeen met het geselecteerde profiel." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Algemene Instellingen" @@ -3515,35 +3489,35 @@ msgstr "Zonder titel" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "instellingen zoeken" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Waarde naar alle extruders kopiëren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle gewijzigde waarden naar alle extruders kopiëren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Deze instelling zichtbaar houden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Beïnvloed door" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Deze instelling wordt altijd door alle extruders gedeeld. Als u hier de instelling wijzigt, wordt de waarde voor alle extruders gewijzigd." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "De waarde wordt afgeleid van de waarden per extruder " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3570,7 @@ msgstr "" "\n" "Klik om de waarde van het profiel te herstellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3581,13 @@ msgstr "" "\n" "Klik om de berekende waarde te herstellen." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Het printen van een brim of raft inschakelen. Deze optie zorgt ervoor dat er extra materiaal rondom of onder het object wordt neergelegd, dat er naderhand eenvoudig kan worden afgesneden." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Laaghoogte" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "U hebt enkele profielinstellingen aangepast. Ga naar de aangepaste modus als u deze wilt wijzigen." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Dit kwaliteitsprofiel is niet beschikbaar voor uw huidige materiaal- en nozzleconfiguratie. Breng hierin wijzigingen aan om gebruik van dit kwaliteitsprofiel mogelijk te maken." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Er is momenteel een aangepast profiel actief. Als u de kwaliteitsschuifregelaar wilt gebruiken, kiest u een standaard kwaliteitsprofiel op het tabblad Aangepast" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Uit" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimenteel" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profiel" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3664,11 @@ msgstr "" "\n" "Klik om het profielbeheer te openen." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favorieten" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Standaard" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder uitschakelen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Platform" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profiel" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configuraties" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Configuratie selecteren" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configuraties" @@ -3984,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Ingeschakeld" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Gebruik lijm bij deze combinatie van materialen voor een betere hechting." @@ -4406,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Instellingen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura afsluiten" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Weet u zeker dat u Cura wilt verlaten?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Bestand(en) openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Package installeren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Bestand(en) openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Binnen de door u geselecteerde bestanden zijn een of meer G-code-bestanden aangetroffen. U kunt maximaal één G-code-bestand tegelijk openen. Selecteer maximaal één bestand als u dit wilt openen als G-code-bestand." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Printer Toevoegen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Nieuwe functies" @@ -4514,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Over Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versie: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "End-to-end-oplossing voor fused filament 3D-printen." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4504,122 @@ msgstr "" "Cura is ontwikkeld door Ultimaker B.V. in samenwerking met de community.\n" "Cura maakt met trots gebruik van de volgende opensourceprojecten:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafische gebruikersinterface (GUI)" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Toepassingskader" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-code-generator" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "InterProcess Communication-bibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Programmeertaal" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI-kader" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Bindingen met GUI-kader" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Bindingenbibliotheek C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Indeling voor gegevensuitwisseling" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Ondersteuningsbibliotheek voor wetenschappelijke berekeningen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Ondersteuningsbibliotheek voor snellere berekeningen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Ondersteuningsbibliotheek voor het verwerken van STL-bestanden" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Ondersteuningsbibliotheek voor het verwerken van tweedimensionale objecten" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Ondersteuningsbibliotheek voor het verwerken van driehoekig rasters" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Ondersteuningsbibliotheek voor de analyse van complexe netwerken" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Ondersteuningsbibliotheek voor het verwerken van 3MF-bestanden" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Ondersteuningsbibliotheek voor bestandsmetadata en streaming" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Seriële-communicatiebibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf-detectiebibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliotheek met veelhoeken" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP-bibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Lettertype" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG-pictogrammen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementatie van Linux-toepassing voor kruisdistributie" @@ -4668,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Project opslaan" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Platform" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 &materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Bij opnieuw opslaan projectsamenvatting niet weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Opslaan" @@ -4869,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Probleemoplossing" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Printernaam" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Voer een naam in voor uw printer" @@ -4933,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Aan de slag" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Modelcontrole" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Dump de inhoud van alle instellingen naar een HTML-bestand." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Godmodus" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Firmware-updater" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Hiermee maakt u een afgevlakte versie van het gewijzigde profiel." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Profielvlakker" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Versie-upgrade van 3.3 naar 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profielschrijver" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Maakt het fabrikanten mogelijk nieuwe materiaal- en kwaliteitsprofielen aan te maken met behulp van een drop-in-gebruikersinterface." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Profielassistent afdrukken" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiellezer" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Actieve instellingen platmaken" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Profiel is platgemaakt en geactiveerd." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Schrijft X3g naar bestanden" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g-bestand" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G-bestand" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Gecomprimeerde driehoeksnet openen" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profielassistent" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profielassistent" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Opnieuw proberen" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Supportstructuur niet laten overlappen met andere modellen" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Instellingen aanpassen voor overlapping met andere modellen" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Instellingen aanpassen voor vulling van andere modellen" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Bestaand(e) bijwerken" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Niet ondersteund" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Vorige" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Tip" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Print experiment" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Checklist" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Selecteer eventuele upgrades die op deze Ultimaker 2 zijn uitgevoerd." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson-blok" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Cameraweergave: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Functionaliteit voor meerdere platformen gebruiken" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Functionaliteit voor meerdere platformen gebruiken (opnieuw opstarten vereist)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Standaardprofielen" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "instellingen zoeken" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Laaghoogte" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Dit kwaliteitsprofiel is niet beschikbaar voor uw huidige materiaal- en nozzleconfiguratie. Breng hierin wijzigingen aan om gebruik van dit kwaliteitsprofiel mogelijk te maken." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Er is momenteel een aangepast profiel actief. Als u de kwaliteitsschuifregelaar wilt gebruiken, kiest u een standaard kwaliteitsprofiel op het tabblad Aangepast" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Platform" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profiel" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Platform" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Dump de inhoud van alle instellingen naar een HTML-bestand." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Godmodus" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Hiermee maakt u een afgevlakte versie van het gewijzigde profiel." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Profielvlakker" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Maakt het fabrikanten mogelijk nieuwe materiaal- en kwaliteitsprofielen aan te maken met behulp van een drop-in-gebruikersinterface." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Profielassistent afdrukken" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Via het netwerk verbonden." diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index 3d30c6745d..b30045a52a 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 61b2b93f3b..a63be5e1ac 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Dutch , Dutch \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Het aantal bodemlagen. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze afgerond naar een geheel getal." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,8 +1433,7 @@ msgstr "Strijken inschakelen" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Nog een extra keer over de bovenlaag gaan, dit keer zonder veel materiaal te extruderen. Hierdoor wordt de kunststof aan de bovenkant verder gesmolten," -" waardoor een gladder oppervlak wordt verkregen. De kamerdruk in de nozzle wordt hoog gehouden zodat de spleten in het oppervlak met materiaal worden gevuld." +msgstr "Nog een extra keer over de bovenlaag gaan, dit keer zonder veel materiaal te extruderen. Hierdoor wordt de kunststof aan de bovenkant verder gesmolten, waardoor een gladder oppervlak wordt verkregen. De kamerdruk in de nozzle wordt hoog gehouden zodat de spleten in het oppervlak met materiaal worden gevuld." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -3568,9 +3577,7 @@ msgstr "Lijnrichting Vulling Supportstructuur" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend" -" gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst" -" is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoek van 0 graden wordt gebruikt." +msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoek van 0 graden wordt gebruikt." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3984,8 +3991,8 @@ msgstr "Minimumgebied verbindingsstructuur" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimumgebied voor verbindingspolygonen. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3994,8 +4001,8 @@ msgstr "Minimumgebied supportdak" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimumgebied voor de supportdaken. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4004,8 +4011,8 @@ msgstr "Minimumgebied supportvloer" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimumgebied voor de supportvloeren. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4045,10 +4052,7 @@ msgstr "Lijnrichting interface supportstructuur" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend" -" gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst" -" is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als" -" interfaces vrij dik of 90 graden zijn) worden gebruikt." +msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als interfaces vrij dik of 90 graden zijn) worden gebruikt." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4058,10 +4062,7 @@ msgstr "Lijnrichting supportdak" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend" -" gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst" -" is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als" -" interfaces vrij dik of 90 graden zijn) worden gebruikt." +msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als interfaces vrij dik of 90 graden zijn) worden gebruikt." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4071,10 +4072,7 @@ msgstr "Lijnrichting supportvloer" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend" -" gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst" -" is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als" -" interfaces vrij dik of 90 graden zijn) worden gebruikt." +msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de standaardhoeken (variërend tussen 45 en 135 graden als interfaces vrij dik of 90 graden zijn) worden gebruikt." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4800,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Hiermee worden de lege lagen onder de eerste geprinte laag verwijderd, indien aanwezig. Als u deze instelling uitschakelt, kunnen lege eerste lagen ontstaan als de Slicetolerantie is ingesteld op Exclusief of Midden." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Maximale resolutie" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Het minimale formaat van een lijnsegment na het slicen. Als u deze waarde verhoogt, wordt het model met een lagere resolutie geprint. Hiermee kan de printer de verwerkingssnelheid van de G-code bijhouden en wordt de slicesnelheid verhoogd doordat details van het raster worden verwijderd die niet kunnen worden verwerkt." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Maximale bewegingsresolutie" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Het minimale formaat van een bewegingslijnsegment na het slicen. Als u deze waarde verhoogt, hebben de bewegingen minder vloeiende hoeken. Hiermee kan de printer de verwerkingssnelheid van de G-code bijhouden, maar kan het model door vermijding minder nauwkeurig worden." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Maximale afwijking" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "De maximaal toegestane afwijking tijdens het verlagen van de resolutie voor de instelling Maximale resolutie. Als u deze waarde verhoogt, wordt de print minder nauwkeurig, maar wordt de G-code kleiner. Maximale afwijking is een limiet voor Maximale resolutie, dus als de twee tegenstrijdig zijn, wordt de Maximale afwijking altijd aangehouden." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5175,38 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polygonen in geslicete lagen, die een kleinere omtrek hebben dan deze waarde, worden eruit gefilterd. Bij lagere waarden krijgt het raster een hogere resolutie, waardoor het slicen langer duurt. Dit is voornamelijk bedoeld voor SLA-printers met een hoge resolutie en zeer kleine 3D-modellen die veel details bevatten." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Maximale resolutie" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Het minimale formaat van een lijnsegment na het slicen. Als u deze waarde verhoogt, wordt het model met een lagere resolutie geprint. Hiermee kan de printer de verwerkingssnelheid van de G-code bijhouden en wordt de slicesnelheid verhoogd doordat details van het raster worden verwijderd die niet kunnen worden verwerkt." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Maximale bewegingsresolutie" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Het minimale formaat van een bewegingslijnsegment na het slicen. Als u deze waarde verhoogt, hebben de bewegingen minder vloeiende hoeken. Hiermee kan de printer de verwerkingssnelheid van de G-code bijhouden, maar kan het model door vermijding minder nauwkeurig worden." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Maximale afwijking" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "De maximaal toegestane afwijking tijdens het verlagen van de resolutie voor de instelling Maximale resolutie. Als u deze waarde verhoogt, wordt de print" -" minder nauwkeurig, maar wordt de G-code kleiner. Maximale afwijking is een limiet voor Maximale resolutie, dus als de twee tegenstrijdig zijn, wordt de" -" Maximale afwijking altijd aangehouden." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5347,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "De snelheid waarmee de printkop tijdens coasting beweegt ten opzichte van de snelheid voor het doorvoerpad. Hiervoor wordt een waarde van iets minder dan 100% aangeraden, omdat de druk in de bowden-buis zakt tijdens een coasting-beweging." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Skinrotatie Wisselen" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Wissel de richting af waarin de boven-/onderlagen worden geprint. Normaal worden deze alleen diagonaal geprint. Met deze instelling worden de alleen-X- en alleen-Y-richtingen toegevoegd." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5529,23 +5515,23 @@ msgstr "De gemiddelde afstand tussen de willekeurig geplaatste punten op elk lij #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Maximale extrusieoffset voor doorvoercompensatie" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "De maximale afstand in mm die moet worden gecompenseerd." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Doorvoercompensatiefactor" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "De vermenigvuldigingsfactor voor de vertaling doorvoer -> afstand." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5838,13 +5824,13 @@ msgstr "Het hoogteverschil tussen de hoogte van de volgende laag ten opzichte va #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Drempelwaarde adaptieve lagen" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "De drempel of er al dan niet een kleinere laag moet worden gebruikt. Deze waarde wordt vergeleken met de waarde van de steilste helling in een laag." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5853,8 +5839,8 @@ msgstr "Hoek Overhangende Wand" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Wanden die overhangen in een hoek groter dan deze waarde, worden geprint met instellingen voor overhangende wanden. Wanneer de waarde 90 is, wordt een wand niet als een overhangende wand gezien." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6233,20 +6219,18 @@ msgstr "Klein kenmerksnelheid" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Kleine kenmerken worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan de hechting en" -" nauwkeurigheid verbeteren." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Eerste laagsnelheid" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Kleine kenmerken op de eerste laag worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan" -" de hechting en nauwkeurigheid verbeteren." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6308,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Omzettingsmatrix die moet worden toegepast op het model wanneer dit wordt geladen vanuit een bestand." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimumgebied voor verbindingspolygonen. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimumgebied voor de supportdaken. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimumgebied voor de supportvloeren. Polygonen met een gebied dat kleiner is dan deze waarde, worden niet gegenereerd." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Skinrotatie Wisselen" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Wissel de richting af waarin de boven-/onderlagen worden geprint. Normaal worden deze alleen diagonaal geprint. Met deze instelling worden de alleen-X- en alleen-Y-richtingen toegevoegd." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Maximale extrusieoffset voor doorvoercompensatie" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "De maximale afstand in mm die moet worden gecompenseerd." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Doorvoercompensatiefactor" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "De vermenigvuldigingsfactor voor de vertaling doorvoer -> afstand." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Drempelwaarde adaptieve lagen" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "De drempel of er al dan niet een kleinere laag moet worden gebruikt. Deze waarde wordt vergeleken met de waarde van de steilste helling in een laag." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Wanden die overhangen in een hoek groter dan deze waarde, worden geprint met instellingen voor overhangende wanden. Wanneer de waarde 90 is, wordt een wand niet als een overhangende wand gezien." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Kleine kenmerken worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan de hechting en nauwkeurigheid verbeteren." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Eerste laagsnelheid" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Kleine kenmerken op de eerste laag worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan de hechting en nauwkeurigheid verbeteren." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Ga nog een extra keer over de bovenlaag, echter zonder materiaal door te voeren. Hierdoor wordt de kunststof aan de bovenkant verder gesmolten, waardoor een gladder oppervlak wordt verkregen." diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 79ec7b48af..744bdbb100 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-24 17:00+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -19,7 +19,7 @@ msgstr "" "X-Generator: Poedit 2.2.3\n" "X-Poedit-SourceCharset: UTF-8\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Ustawienia drukarki" @@ -41,13 +41,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Pliki G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "Zapisywacz G-code nie obsługuje trybu nietekstowego." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Przygotuj G-code przed eksportem." @@ -57,7 +57,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Asystent Modelu 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -76,16 +76,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Aktualizacja Oprogramowania Sprzętowego" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Spłaszczyć aktywne ustawienia" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Profil został spłaszczony i aktywowany." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -126,21 +116,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Drukowanie w toku" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Zapisuje do plików X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Plik X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Plik X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -212,9 +187,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Nie można zapisać na wymiennym dysku {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Błąd" @@ -244,8 +219,8 @@ msgstr "Wyjmij urządzenie wymienne {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Ostrzeżenie" @@ -277,17 +252,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Połącz przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Drukuj przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Drukuj przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Połączone przez sieć" @@ -302,6 +277,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Błąd druku" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -502,9 +492,9 @@ msgid "GIF Image" msgstr "Obraz GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Otwórz skompresowaną siatkę trójkątów" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -595,12 +585,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Konfiguruj ustawienia każdego modelu z osobna" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Zalecane" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Niestandardowe" @@ -611,19 +601,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Plik 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Dysza" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Plik projektu {0} zawiera nieznany typ maszyny {1}. Nie można zaimportować maszyny. Zostaną zaimportowane modele." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Otwórz Plik Projektu" @@ -703,16 +693,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profile Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Asystent Profilu" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Asystent Profilu" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -733,7 +713,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Podgląd" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -749,134 +728,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Logowanie nie powiodło się" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Niewspierany" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Plik już istnieje" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Plik {0} już istnieje. Czy na pewno chcesz go nadpisać?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Nieprawidłowy adres URL pliku:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Ustawienia zostały zmienione w celu dopasowania do bieżącej dostępności ekstruderów:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Ustawienia zostały zaaktualizowane" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstruder(y) wyłączony(/e)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Nieznany" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Nie udało się wyeksportować profilu do {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Nie można eksportować profilu do {0}: Wtyczka pisarza zgłosiła błąd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Wyeksportowano profil do {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Eksport udany" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Nie powiódł się import profilu z {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Nie można importować profilu z {0} przed dodaniem drukarki." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Brak niestandardowego profilu do importu w pliku {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Nie powiódł się import profilu z {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Profil {0} zawiera błędne dane, nie można go importować." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Błąd importu profilu z {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil zaimportowany {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Plik {0} nie zawiera żadnego poprawnego profilu." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} ma nieznany typ pliku lub jest uszkodzony." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Niestandardowy profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilowi brakuje typu jakości." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -942,14 +935,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Inny" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Plik pocięty wcześniej {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Następny" @@ -963,9 +955,9 @@ msgstr "Grupa #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Zamknij" @@ -980,40 +972,85 @@ msgstr "Dodaj" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Anuluj" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Nie zastąpione" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Profile niestandardowe" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Wszystkie Wspierane Typy ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Wszystkie Pliki (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Nieznany" +msgid "Custom Material" +msgstr "Niestandardowy materiał" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Niestandardowy" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1025,17 +1062,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Dostępne drukarki sieciowe" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Niestandardowy materiał" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Niestandardowy" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1071,11 +1097,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Nie można uzyskać dostępu do serwera kont Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Spróbuj ponownie" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1260,62 +1281,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Wyślij raport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ładowanie drukarek..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Ustawianie sceny ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ładowanie interfejsu ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Jednocześnie można załadować tylko jeden plik G-code. Pominięto importowanie {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Nie można otworzyć żadnego innego pliku, jeśli ładuje się G-code. Pominięto importowanie {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Wybrany model był zbyta mały do załadowania." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Ustawienia drukarki" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Szerokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1324,57 +1350,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Głębokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Wysokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Kształt stołu roboczego" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Początek na środku" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Podgrzewany stół" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Grzany obszar roboczy" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Wersja G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ustawienia głowicy" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X max" @@ -1384,22 +1410,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Wysokość wózka" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Liczba ekstruderów" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Początkowy G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Końcowy G-code" @@ -1478,7 +1504,7 @@ msgstr "Wtyczki" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1673,11 +1699,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Drukarka" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Rdzeń drukujący" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1933,9 +1954,9 @@ msgid "Edit" msgstr "Edycja" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Usunąć" @@ -1956,61 +1977,61 @@ msgctxt "@label" msgid "Type" msgstr "Rodzaj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Wersja oprogramowania" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Ta drukarka nie jest skonfigurowana jako host dla grupy drukarek." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Ta drukarka jest hostem grupy %1 drukarek." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Drukarka pod tym adresem jeszcze nie odpowiedziała." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Połącz" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Nieprawidłowy adres IP" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Proszę podać poprawny adres IP." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Adres drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Wprowadź adres IP drukarki." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2065,17 +2086,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Zakończone %1 z %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Drukuj" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Drukuj przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Drukuj" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Wybór drukarki" @@ -2426,72 +2447,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Wygładzanie" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Typ siatki" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Normalny model" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Drukuj jako podpora" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Nie wspieraj nałożeń z innymi modelami" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modyfikuj ustawienia nakładania z innymi modelami" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modyfikuj ustawienia wypełnienia innych modeli" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Wybierz ustawienia" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Wybierz Ustawienia, aby dostosować ten model" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtr..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Pokaż wszystko" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Typ siatki" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Normalny model" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Drukuj jako podpora" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Wybierz ustawienia" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Otwórz projekt" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Zaktualizuj istniejące" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Utwórz nowy" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2516,6 +2536,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Aktualizacja" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Utwórz nowy" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2529,7 +2554,7 @@ msgid "Printer Group" msgstr "Grupa drukarek" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Ustawienia profilu" @@ -2540,75 +2565,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Jak powinien zostać rozwiązany problem z profilem?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nazwa" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Nie w profilu" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 nadpisanie" msgstr[1] "%1 Zastępuje" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Pochodna z" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 nadpisanie" msgstr[1] "%1, %2 zastępuje" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Ustawienia materiału" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Jak powinien zostać rozwiązany problem z materiałem?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Ustawienie widoczności" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Tryb" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Widoczne ustawienie:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 poza %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Ładowanie projektu usunie wszystkie modele z platformy roboczej." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Otwórz" @@ -2715,54 +2746,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Automatycznie twórz kopie zapasowe każdego dnia, w którym uruchomiono Curę." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Niewspierany" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Poprzedni" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Eksportuj" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Końcówka" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Podstawowe" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Próbny wydruk" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista kontrolna" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Proszę wybrać ulepszenia w tym Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2848,170 +2831,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Czy na pewno chcesz przerwać drukowanie?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informacja" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Potwierdź Zmianę Średnicy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Średnica nowego filamentu została ustawiona na %1mm, i nie jest kompatybilna z bieżącym ekstruderem. Czy chcesz kontynuować?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Wyświetlana nazwa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Typ Materiału" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Kolor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Właściwości" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Gęstość" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Średnica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Koszt Filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Waga filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Długość Filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Koszt na metr" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Ten materiał jest powiązany z %1 i dzieli się niekórymi swoimi właściwościami." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Odłącz materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Opis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informacje dotyczące przyczepności" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ustawienia druku" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Aktywuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Stwórz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplikuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Eksportuj" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Drukarka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Potwierdź Usunięcie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Czy na pewno chcesz usunąć %1? Nie można tego cofnąć!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importuj Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Nie można zaimportować materiału %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Udało się zaimportować materiał %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Eksportuj Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Nie udało się wyeksportować materiału do %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Udało się wyeksportować materiał do %1" @@ -3026,27 +3015,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Zaznacz wszystko" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Przeliczone" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Ustawienie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Aktualny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Jednostka" @@ -3057,307 +3046,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Ogólny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interfejs" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Język:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Waluta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Motyw:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Musisz zrestartować aplikację, aby te zmiany zaczęły obowiązywać." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Tnij automatycznie podczas zmiany ustawień." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatyczne Cięcie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Zachowanie okna edycji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Zaznacz nieobsługiwane obszary modelu na czerwono. Bez wsparcia te obszary nie będą drukowane prawidłowo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Wyświetl zwis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Przenosi kamerę, aby model był w centrum widoku, gdy wybrano model" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Wyśrodkuj kamerę kiedy przedmiot jest zaznaczony" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Czy domyślne zachowanie zoomu powinno zostać odwrócone?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Odwróć kierunek zoomu kamery." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Czy przybliżanie powinno poruszać się w kierunku myszy?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Powiększanie w kierunku myszy nie jest obsługiwane w danej perspektywie." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Przybliżaj w kierunku myszy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Czy modele na platformie powinny być przenoszone w taki sposób, aby nie przecinały się?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Upewnij się, że modele są oddzielone" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Czy modele na platformie powinny być przesunięte w dół, aby dotknęły stołu roboczego?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automatycznie upuść modele na stół roboczy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Pokaż wiadomości ostrzegawcze w czytniku g-code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Wiadomość ostrzegawcza w czytniku g-code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Czy warstwa powinna być wymuszona w trybie zgodności?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Wymuszenie widoku warstw w trybie zgodności (wymaga ponownego uruchomienia)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Jakiego rodzaju kamery należy użyć do renderowania?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Renderowanie z kamery: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspektywiczny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Rzut ortograficzny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Otwieranie i zapisywanie plików" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Czy modele powinny być skalowane do wielkości obszaru roboczego, jeśli są zbyt duże?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaluj duże modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Model może wydawać się bardzo mały, jeśli jego jednostka jest na przykład w metrach, a nie w milimetrach. Czy takie modele powinny być skalowane?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaluj bardzo małe modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Czy modele powinny zostać zaznaczone po załadowaniu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Zaznaczaj modele po załadowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Czy przedrostek oparty na nazwie drukarki powinien być automatycznie dodawany do nazwy zadania?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Dodaj przedrostek maszyny do nazwy zadania" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Czy podsumowanie powinno być wyświetlane podczas zapisu projektu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Pokaż okno podsumowania podczas zapisywaniu projektu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Domyślne zachowanie podczas otwierania pliku projektu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Domyślne zachowanie podczas otwierania pliku projektu: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Zawsze pytaj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Zawsze otwieraj jako projekt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Zawsze importuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kiedy dokonasz zmian w profilu i przełączysz się na inny, zostanie wyświetlone okno z pytaniem, czy chcesz zachować twoje zmiany, czy nie. Możesz też wybrać domyślne zachowanie, żeby to okno już nigdy nie było pokazywane." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Domyślne zachowanie dla zmienionych ustawień podczas zmiany profilu na inny: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Zawsze pytaj o to" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Zawsze odrzucaj wprowadzone zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Zawsze przenoś wprowadzone zmiany do nowego profilu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Prywatność" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Czy Cura ma sprawdzać dostępność aktualizacji podczas uruchamiania programu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Sprawdź, dostępność aktualizacji podczas uruchamiania" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do Ultimaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Wyślij (anonimowe) informacje o drukowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Więcej informacji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Eksperymentalne" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Użyj funkcji wielu pól roboczych" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Użyj funkcji wielu pól roboczych (wymagany restart)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3365,93 +3348,84 @@ msgid "Printers" msgstr "Drukarki" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Zmień nazwę" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Stwórz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplikuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Stwórz profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Podaj nazwę tego profilu." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplikuj profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Zmień nazwę profilu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importuj Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Eksportuj Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drukarka: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Domyślne profile" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Profile niestandardowe" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aktualizuj profil z bieżącymi ustawieniami" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Odrzuć bieżące zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ten profil używa ustawień domyślnych określonych przez drukarkę, dlatego nie ma żadnych ustawień z poniższej liście." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Aktualne ustawienia odpowiadają wybranemu profilowi." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ustawienia ogólne" @@ -3516,35 +3490,35 @@ msgstr "Bez tytułu" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "ustawienia wyszukiwania" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Skopiuj wartość do wszystkich ekstruderów" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Skopiuj wszystkie zmienione wartości do wszystkich ekstruderów" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ukryj tę opcję" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nie pokazuj tej opcji" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pozostaw tę opcję widoczną" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3576,17 +3550,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Pod wpływem" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "To ustawienie jest dzielone pomiędzy wszystkimi ekstruderami. Zmiana tutaj spowoduje zmianę dla wszystkich ekstruderów." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Wartość jest pobierana z osobna dla każdego ekstrudera " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3597,7 +3571,7 @@ msgstr "" "\n" "Kliknij, aby przywrócić wartość z profilu." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3608,6 +3582,13 @@ msgstr "" "\n" "Kliknij, aby przywrócić wartość obliczoną." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3648,26 +3629,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Włącz drukowanie obrysu lub tratwy. Spowoduje to dodanie płaskiej powierzchni wokół lub pod Twoim obiektem, która jest łatwa do usunięcia po wydruku." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Wysokość warstwy" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Zmodyfikowałeś ustawienia profilu. Jeżeli chcesz je zmienić, przejdź do trybu niestandardowego." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Ten profil jakości nie jest dostępny dla bieżącej konfiguracji materiałów i dysz. Zmień ją, aby włączyć ten profil jakości." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Niestandardowy profil jest obecnie aktywny. Aby włączyć pasek jakości, wybierz domyślny profil w zakładce Niestandardowe" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3678,12 +3644,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Wył" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Eksperymentalne" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3694,6 +3665,11 @@ msgstr "" "\n" "Kliknij, aby otworzyć menedżer profili." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3821,11 +3797,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Ulubione" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Podstawowe" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3861,16 +3842,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Wyłącz Ekstruder" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Pole robocze" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3950,12 +3921,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Konfiguracje" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Wybierz konfigurację" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Konfiguracje" @@ -3985,12 +3956,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Włączona" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Użyj kleju dla lepszej przyczepności dla tej kombinacji materiałów." @@ -4407,44 +4378,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Zamykanie Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Czy jesteś pewien, że chcesz zakończyć Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Otwórz plik(i)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Instaluj pakiety" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Otwórz plik(i)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Znaleziono jeden lub więcej plików G-code w wybranych plikach. Możesz otwierać tylko jeden plik G-code jednocześnie. Jeśli chcesz otworzyć plik G-code, proszę wybierz tylko jeden." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Dodaj drukarkę" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Co nowego" @@ -4515,17 +4486,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "O Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "version: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kompletne rozwiązanie do druku przestrzennego." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4534,122 +4505,122 @@ msgstr "" "Cura jest rozwijana przez firmę Ultimaker B.V. we współpracy ze społecznością.\n" "Cura z dumą korzysta z następujących projektów open source:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Graficzny interfejs użytkownika" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Struktura aplikacji" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Generator g-code" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteka komunikacji międzyprocesowej" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Język programowania" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Framework GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Powiązania Frameworka GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteka Powiązań C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Format wymiany danych" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Wsparcie biblioteki do obliczeń naukowych" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Wsparcie biblioteki dla szybszej matematyki" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Wsparcie biblioteki do obsługi plików STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Biblioteka pomocnicza do obsługi obiektów płaskich" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Biblioteka pomocnicza do obsługi siatek trójkątów" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Biblioteka pomocnicza do analizy złożonych sieci" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Wsparcie biblioteki do obsługi plików 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Biblioteka pomocy dla metadanych plików i przesyłania strumieniowego" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteka komunikacji szeregowej" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bilbiotek poszukująca Zeroconf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteka edytująca pola" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteka Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Czcionka" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Ikony SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Wdrożenie aplikacji pomiędzy dystrybucjami Linux" @@ -4669,32 +4640,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Zapisz projekt" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Pole robocze" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Ekstruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiał" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Nie pokazuj podsumowania projektu podczas ponownego zapisywania" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Zapisz" @@ -4870,12 +4836,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Rozwiązywanie problemów" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nazwa drukarki" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Podaj nazwę drukarki" @@ -4934,6 +4900,31 @@ msgctxt "@button" msgid "Get started" msgstr "Rozpocznij" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4994,16 +4985,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Sprawdzacz Modelu" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Wsypuje zawartość wszystkich ustawień do pliku HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Tryb Boga" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5014,16 +4995,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Aktualizacja oprogramowania sprzętowego" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Stwórz spłaszczony profil zmian jakości." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Spłaszcz profil" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5224,6 +5195,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Ulepszenie Wersji z 3.3 do 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5424,16 +5405,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profile Writer" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Pozwala twórcą materiałów na tworzenie nowych profili materiałów i jakości używając rozwijanego menu." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Asystent Profilów Druku" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5474,6 +5445,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Czytnik Profili Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Spłaszczyć aktywne ustawienia" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Profil został spłaszczony i aktywowany." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Zapisuje do plików X3g" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Plik X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Plik X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Otwórz skompresowaną siatkę trójkątów" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Asystent Profilu" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Asystent Profilu" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Spróbuj ponownie" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Rdzeń drukujący" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Nie wspieraj nałożeń z innymi modelami" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modyfikuj ustawienia nakładania z innymi modelami" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modyfikuj ustawienia wypełnienia innych modeli" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Zaktualizuj istniejące" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Niewspierany" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Poprzedni" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Końcówka" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Próbny wydruk" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista kontrolna" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Proszę wybrać ulepszenia w tym Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Renderowanie z kamery: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Użyj funkcji wielu pól roboczych" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Użyj funkcji wielu pól roboczych (wymagany restart)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Domyślne profile" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "ustawienia wyszukiwania" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Wysokość warstwy" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Ten profil jakości nie jest dostępny dla bieżącej konfiguracji materiałów i dysz. Zmień ją, aby włączyć ten profil jakości." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Niestandardowy profil jest obecnie aktywny. Aby włączyć pasek jakości, wybierz domyślny profil w zakładce Niestandardowe" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Pole robocze" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Pole robocze" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Wsypuje zawartość wszystkich ustawień do pliku HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Tryb Boga" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Stwórz spłaszczony profil zmian jakości." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Spłaszcz profil" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Pozwala twórcą materiałów na tworzenie nowych profili materiałów i jakości używając rozwijanego menu." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Asystent Profilów Druku" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Połączono przez sieć." diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 850a014a1a..f0b5eec019 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Mariusz 'Virgin71' Matłosz \n" "Language-Team: reprapy.pl\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index aefdf33ce2..4d7f527a53 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-30 15:45+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Liczba dolnych warstw. Przy obliczaniu grubości dołu ta wartość jest zaokrąglana do liczby całkowitej." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3981,8 +3991,8 @@ msgstr "Minimalna Powierzchnia Interfejsu Podpór" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimalny rozmiar obszaru dla interfejsu podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3991,8 +4001,8 @@ msgstr "Minimalna Powierzchnia Dachu Podpór" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimalny rozmiar obszaru dla dachu podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4001,8 +4011,8 @@ msgstr "Minimalna Powierzchnia Podłoża Podpór" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Minimalny rozmiar obszaru dla podłoża podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4788,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Usuń puste warstwy poniżej pierwszej drukowanej warstwy jeżeli takie występują. Wyłączenie tego ustawienia może powodować puste pierwsze warstwy jeżeli Tolerancja Cięcia jest ustawiona na Włącznie lub Środek." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Maksymalna Rozdzielczość" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Minimalny rozmiar linii segmentu po pocięciu. Jeżeli to zwiększysz, siatka będzie miała mniejszą rozdzielczość. Może to spowodować przyspieszenie prędkości przetwarzania g-code i przyspieszenie prędkości cięcia poprzez usunięcie detali siatki, których tak czy tak nie można przetworzyć." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Maksymalna Rozdzielczość Ruchów Jałowych" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Minimalny rozmiar segmentu linii ruchu jałowego po pocięciu. Jeżeli ta wartość zostanie zwiększona, ruch jałowy będzie miał mniej gładkie zakręty. Może to spowodować przyspieszenie prędkości przetwarzania g-code, ale unikanie modelu może być mniej dokładne." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Maksymalne odchylenie" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "Maksymalne odchylenie dozwolone przy zmniejszaniu rozdzielczości dla ustawienia maksymalnej rozdzielczości. Jeśli to zwiększysz, wydruk będzie mniej dokładny, ale g-code będzie mniejszy. Maksymalne odchylenie jest limitem dla maksymalnej rozdzielczości, więc wystąpi konflikt, maksymalne odchylenie zawsze będzie używane." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5163,36 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Wieloboki w pociętych warstwach mające obwód mniejszy, niż podany, będą odfiltrowane. Mniejsze wartości dają wyższą rozdzielczość siatki kosztem czasu cięcia. Funkcja ta jest przeznaczona głównie dla drukarek wysokiej rozdzielczości SLA oraz bardzo małych modeli z dużą ilością detali." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Maksymalna Rozdzielczość" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Minimalny rozmiar linii segmentu po pocięciu. Jeżeli to zwiększysz, siatka będzie miała mniejszą rozdzielczość. Może to spowodować przyspieszenie prędkości przetwarzania g-code i przyspieszenie prędkości cięcia poprzez usunięcie detali siatki, których tak czy tak nie można przetworzyć." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Maksymalna Rozdzielczość Ruchów Jałowych" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Minimalny rozmiar segmentu linii ruchu jałowego po pocięciu. Jeżeli ta wartość zostanie zwiększona, ruch jałowy będzie miał mniej gładkie zakręty. Może to spowodować przyspieszenie prędkości przetwarzania g-code, ale unikanie modelu może być mniej dokładne." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Maksymalne odchylenie" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "Maksymalne odchylenie dozwolone przy zmniejszaniu rozdzielczości dla ustawienia maksymalnej rozdzielczości. Jeśli to zwiększysz, wydruk będzie mniej dokładny, ale g-code będzie mniejszy. Maksymalne odchylenie jest limitem dla maksymalnej rozdzielczości, więc wystąpi konflikt, maksymalne odchylenie zawsze będzie używane." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5333,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Prędkość poruszania się podczas Wypływania, w stosunku do prędkości ścieżki ekstruzji. Zaleca się wartość nieco poniżej 100%, ponieważ podczas Wypływania ciśnienie w rurce bowden spada." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Zmień Kierunek Skóry" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Zmień kierunek, w jakim drukowane są górne/dolne warstwy. Zazwyczaj są one drukowane na ukos. Ustawienie to dodaje kierunek \"tylko X\" i \"tylko Y\"." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5515,23 +5515,23 @@ msgstr "Średnia odległość między losowymi punktami wprowadzonymi w każdym #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Maks. offset ekstruzji do kompensowania przepływu" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Maksymalna odległość w mm do skompensowania." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Współczynnik kompensacji przepływu" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Współczynnik mnożący przepływu -> tłumaczenie odległości." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5824,13 +5824,13 @@ msgstr "Różnica w wysokości pomiędzy następną wysokością warstwy i poprz #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Próg zmiany warstw" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Opóźnienie w wyborze, czy użyć mniejszej warstwy, czy nie. Ta liczba jest porównywana do najbardziej stromego nachylenia na warstwie." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5839,8 +5839,8 @@ msgstr "Kąt Nawisającej Ścianki" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Ścianka o większym kącie nawisu niż podany będzie drukowana z użyciem ustawień nawisającej ścianki. Przy wartości 90°, żadna ścianka nie będzie traktowana jako ścianka nawisająca." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6219,18 +6219,18 @@ msgstr "Prędkość małych elementów" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Małe obiekty zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Prędkość pierwszej warstwy" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Małe elementy na pierwszej warstwie zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności i dokładności." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6292,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Forma przesunięcia, która ma być zastosowana do modelu podczas ładowania z pliku." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimalny rozmiar obszaru dla interfejsu podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimalny rozmiar obszaru dla dachu podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Minimalny rozmiar obszaru dla podłoża podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, nie będą generowane." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Zmień Kierunek Skóry" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Zmień kierunek, w jakim drukowane są górne/dolne warstwy. Zazwyczaj są one drukowane na ukos. Ustawienie to dodaje kierunek \"tylko X\" i \"tylko Y\"." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Maks. offset ekstruzji do kompensowania przepływu" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Maksymalna odległość w mm do skompensowania." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Współczynnik kompensacji przepływu" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Współczynnik mnożący przepływu -> tłumaczenie odległości." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Próg zmiany warstw" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Opóźnienie w wyborze, czy użyć mniejszej warstwy, czy nie. Ta liczba jest porównywana do najbardziej stromego nachylenia na warstwie." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Ścianka o większym kącie nawisu niż podany będzie drukowana z użyciem ustawień nawisającej ścianki. Przy wartości 90°, żadna ścianka nie będzie traktowana jako ścianka nawisająca." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Małe obiekty zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Prędkość pierwszej warstwy" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Małe elementy na pierwszej warstwie zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności i dokładności." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Przejedź nad górną powierzchnią dodatkowy raz, ale bez ekstrudowania materiału. Topi to plastyk na górze, co powoduje gładszą powierzchnię." diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index a3e525a21c..b38b38fde6 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" "Language-Team: Chinese , PCDotFan , Chinese \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.1.1\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "打印机设置" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "GCode 文件" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter 不支持非文本模式。" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "导出前请先准备 G-code。" @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "三维模型的助理" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "更新固件" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "合并有效设置" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "配置文件已被合并并激活。" - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "正在进行打印" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "写入 X3g 到文件" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g 文件" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 文件" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "无法保存到可移动磁盘 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "错误" @@ -243,8 +218,8 @@ msgstr "弹出可移动设备 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "通过网络连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "通过网络打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "通过网络打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "已通过网络连接" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "打印错误" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "GIF 图像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "打开压缩三角网格" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "设置对每个模型的单独设定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "推荐" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "自定义" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 文件" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "喷嘴" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "项目文件 {0} 包含未知机器类型 {1}。无法导入机器。将改为导入模型。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "打开项目文件" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 配置文件" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "配置文件助手" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "配置文件助手" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "预览" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "登录失败" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "不支持" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "文件已存在" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "文件 {0} 已存在。您确定要覆盖它吗？" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "文件 URL 无效：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "已根据挤出机的当前可用性更改设置：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "设置已更新" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "挤出机已禁用" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "未知" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "无法将配置文件导出至 {0} ： {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "无法将配置文件导出至 {0} ： 写入器插件报告故障。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "配置文件已导出至： {0} " -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "导出成功" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "无法从 {0} 导入配置文件：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "无法在添加打印机前从 {0} 导入配置文件。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "没有可导入文件 {0} 的自定义配置文件" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "无法从 {0} 导入配置文件：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "此配置文件 {0} 包含错误数据，无法导入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "无法从 {0} 导入配置文件：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "已成功导入配置文件 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "文件 {0} 不包含任何有效的配置文件。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "配置 {0} 文件类型未知或已损坏。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "自定义配置文件" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "配置文件缺少打印质量类型定义。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "预切片文件 {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "下一步" @@ -962,9 +954,9 @@ msgstr "组 ＃{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "关闭" @@ -979,40 +971,85 @@ msgstr "添加" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "取消" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "未覆盖" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "自定义配置文件" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "所有支持的文件类型 ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有文件 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "未知" +msgid "Custom Material" +msgstr "自定义材料" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "自定义" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "可用的网络打印机" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "自定义材料" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "自定义" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "无法连接 Ultimaker 帐户服务器。" -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "重试" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "发送报告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在载入打印机..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在设置场景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在载入界面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能加载一个 G-code 文件。{0} 已跳过导入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果加载 G-code，则无法打开其他任何文件。{0} 已跳过导入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "所选模型过小，无法加载。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "打印机设置" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (宽度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (深度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "打印平台形状" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "置中" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "加热床" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "加热的构建体积" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "G-code 风格" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "打印头设置" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X 最大值" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "十字轴高度" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "挤出机数目" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "开始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "结束 G-code" @@ -1477,7 +1503,7 @@ msgstr "插件" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "机器" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "打印芯" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "编辑" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "删除" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "类型" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "固件版本" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "地址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "这台打印机未设置为运行一组打印机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "这台打印机是一组共 %1 台打印机的主机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "该网络地址的打印机尚未响应。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "IP 地址无效" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "请输入有效的 IP 地址。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "打印机网络地址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "请输入打印机在网络上的 IP 地址。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "完成 %1 于 %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "打印" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "通过网络打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "打印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "打印机选择" @@ -2424,72 +2445,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "平滑" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "网格类型" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "正常模式" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "打印为支撑" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "不支持与其他模型重叠" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "修改与其他模型重叠的设置" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "修改其他模型填充物的设置" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "选择设置" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "选择对此模型的自定义设置" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "筛选…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "显示全部" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "网格类型" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "正常模式" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "打印为支撑" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "选择设置" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "打开项目" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "更新已有配置" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "新建" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2514,6 +2534,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "更新" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "新建" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2527,7 +2552,7 @@ msgid "Printer Group" msgstr "打印机组" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "配置文件设置" @@ -2538,73 +2563,79 @@ msgid "How should the conflict in the profile be resolved?" msgstr "配置文件中的冲突如何解决？" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "名字" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "不在配置文件中" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 重写" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "衍生自" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 重写" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "材料设置" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "材料的设置冲突应如何解决？" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "设置可见性" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "模式" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "可见设置：" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "加载项目将清除打印平台上的所有模型。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "打开" @@ -2711,54 +2742,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "在 Cura 每天启动时自动创建备份。" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "不支持" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "上一步" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "导出" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "提示" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "通用" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "打印试验" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "检查表" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "请选择适用于 Ultimaker 2 的升级文件。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2844,170 +2827,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "您确定要中止打印吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "确认直径更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新的灯丝直径被设置为%1毫米，这与当前的挤出机不兼容。你想继续吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "显示名称" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "品牌" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "材料类型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "颜色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "属性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "直径" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "耗材成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "耗材重量" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "耗材长度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "每米成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "此材料与 %1 相关联，并共享其某些属性。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "解绑材料" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "描述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "粘附信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "打印设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "激活" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "创建" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "复制" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "导入" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "导出" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "打印机" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "确认删除" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "您确认要删除 %1？该操作无法恢复！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "导入配置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "无法导入材料 %1： %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功导入材料 %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "导出材料" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "无法导出材料至 %1： %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "成功导出材料至： %1" @@ -3022,27 +3011,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "全部勾选" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "已计算" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "当前" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "单位" @@ -3053,307 +3042,301 @@ msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "接口" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "语言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "币种：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "主题：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新启动 Cura，新的设置才能生效。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "当设置被更改时自动进行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "自动切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "视区行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "以红色突出显示模型需要增加支撑结构的区域。没有支撑，这些区域将无法正确打印。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "显示悬垂（Overhang）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "当模型被选中时，视角将自动调整到最合适的观察位置（模型处于正中央）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "当项目被选中时，自动对中视角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要令 Cura 的默认缩放操作反转吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反转视角变焦方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟随鼠标方向进行缩放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "正交透视不支持通过鼠标进行缩放。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟随鼠标方向缩放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移动平台上的模型，使它们不再相交吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "确保每个模型都保持分离" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "需要转动模型，使它们接触打印平台吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自动下降模型到打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 G-code 读取器中显示警告信息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 读取器中的警告信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "层视图要强制进入兼容模式吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "强制层视图兼容模式（需要重新启动）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "应使用哪种类型的摄像头进行渲染？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "摄像头渲染： " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "透视" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "正交" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "打开并保存文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "当模型的尺寸过大时，是否将模型自动缩小至成形空间体积？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "缩小过大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "当模型以米而不是毫米为单位时，模型可能会在打印平台中显得非常小。在此情况下是否进行放大？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大过小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型是否应该在加载后被选中？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "选择模型时加载" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "打印机名是否自动作为打印作业名称的前缀？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "将机器前缀添加到作业名称中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "保存项目文件时是否显示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "保存项目时显示摘要对话框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "打开项目文件时的默认行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "打开项目文件时的默认行为： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "总是询问" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "始终作为一个项目打开" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "始终导入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "当您对配置文件进行更改并切换到其他配置文件时将显示一个对话框，询问您是否要保留修改。您也可以选择一个默认行为并令其不再显示该对话框。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "切换到不同配置文件时对设置值更改的默认操作： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "总是询问" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "总是舍失更改的设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "总是将更改的设置传输至新配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "隐私" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "当 Cura 启动时，是否自动检查更新？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "启动时检查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "您愿意将关于您的打印数据以匿名形式发送到 Ultimaker 吗？注意：我们不会记录/发送任何模型、IP 地址或其他私人数据。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）发送打印信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "详细信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "实验性" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "使用多打印平台功能" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "使用多打印平台功能（需要重启）" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3361,93 +3344,84 @@ msgid "Printers" msgstr "打印机" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "重命名" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "创建" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "复制" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "创建配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "请为此配置文件提供名称。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "复制配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "导入配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "导出配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "打印机：%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "默认配置文件" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "自定义配置文件" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "舍弃当前更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此配置文件使用打印机指定的默认值，因此在下面的列表中没有此设置项。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "您当前的设置与选定的配置文件相匹配。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局设置" @@ -3512,35 +3486,35 @@ msgstr "未命名" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "搜索设置" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "将值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "将所有修改值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隐藏此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再显示此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此设置可见" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3572,17 +3546,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "受影响项目" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "此设置始终在所有挤出机之间共享。在此处更改它将改变所有挤出机的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "该值将会根据每一个挤出机的设置而确定 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3593,7 +3567,7 @@ msgstr "" "\n" "单击以恢复配置文件的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3604,6 +3578,12 @@ msgstr "" "\n" "单击以恢复自动计算的值。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3644,26 +3624,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "允许打印 Brim 或 Raft。这将在您的对象周围或下方添加一个容易切断的平面区域。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "层高" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "您已修改部分配置文件设置。 如果您想对其进行更改，请转至自定义模式。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "此质量配置文件不适用于当前材料和喷嘴配置。请进行更改以便启用此质量配置文件。" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "自定义配置文件目前处于活动状态。 如要启用质量滑块，请在“自定义”选项卡中选择一个默认质量配置文件" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3674,12 +3639,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "关" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "实验性" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3690,6 +3660,11 @@ msgstr "" "\n" "点击打开配置文件管理器。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3817,11 +3792,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "收藏" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "通用" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3857,16 +3837,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "禁用挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "打印平台(&B)" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "配置文件（&P）" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3944,12 +3914,12 @@ msgctxt "@header" msgid "Configurations" msgstr "配置" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "选择配置" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "配置" @@ -3979,12 +3949,12 @@ msgctxt "@label" msgid "Enabled" msgstr "已启用" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "用胶粘和此材料组合以产生更好的附着。" @@ -4398,44 +4368,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "设置" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "关闭 Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "您确定要退出 Cura 吗？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "安装包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我们已经在您选择的文件中找到一个或多个 G-Code 文件。您一次只能打开一个 G-Code 文件。若需打开 G-Code 文件，请仅选择一个。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "新增打印机" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "新增功能" @@ -4505,17 +4475,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "关于 Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "版本： %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熔丝 3D 打印技术的的端对端解决方案。" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4524,122 +4494,122 @@ msgstr "" "Cura 由 Ultimaker B.V. 与社区合作开发。\n" "Cura 使用以下开源项目：" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "图形用户界面" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "应用框架" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-code 生成器" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "进程间通信交互使用库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "编程语言" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI 框架" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 框架绑定" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C / C++ 绑定库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "数据交换格式" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "科学计算支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "高速运算支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "用于处理 STL 文件的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "用于处理平面对象的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "用于处理三角网格的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "用于分析复杂网络的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "用于处理 3MF 文件的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "用于文件元数据和流媒体的支持库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "串口通讯库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf 发现库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "多边形剪辑库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 库" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "字体" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG 图标" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 交叉分布应用程序部署" @@ -4659,32 +4629,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "保存项目" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "打印平台" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "挤出机 %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "保存时不再显示项目摘要" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "保存" @@ -4860,12 +4825,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "故障排除" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "打印机名称" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "请指定打印机名称" @@ -4924,6 +4889,31 @@ msgctxt "@button" msgid "Get started" msgstr "开始" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4984,16 +4974,6 @@ msgctxt "name" msgid "Model Checker" msgstr "模型检查器" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "将所有设置内容转储至 HTML 文件。" - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "God 模式" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5004,16 +4984,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "固件更新程序" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "创建一份合并质量变化配置文件。" - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "配置文件合并器" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5214,6 +5184,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "版本升级3.3到3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5414,16 +5394,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 配置文件写入器" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "允许材料制造商使用下拉式 UI 创建新的材料和质量配置文件。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "打印配置文件助手" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5464,6 +5434,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 配置文件读取器" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "合并有效设置" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "配置文件已被合并并激活。" + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "写入 X3g 到文件" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g 文件" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G 文件" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "打开压缩三角网格" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "配置文件助手" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "配置文件助手" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "重试" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "打印芯" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "不支持与其他模型重叠" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "修改与其他模型重叠的设置" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "修改其他模型填充物的设置" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "更新已有配置" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "不支持" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "上一步" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "提示" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "打印试验" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "检查表" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "请选择适用于 Ultimaker 2 的升级文件。" + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "摄像头渲染： " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "使用多打印平台功能" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "使用多打印平台功能（需要重启）" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "默认配置文件" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "搜索设置" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "层高" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "此质量配置文件不适用于当前材料和喷嘴配置。请进行更改以便启用此质量配置文件。" + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "自定义配置文件目前处于活动状态。 如要启用质量滑块，请在“自定义”选项卡中选择一个默认质量配置文件" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "打印平台(&B)" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "配置文件（&P）" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "打印平台" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "将所有设置内容转储至 HTML 文件。" + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "God 模式" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "创建一份合并质量变化配置文件。" + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "配置文件合并器" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "允许材料制造商使用下拉式 UI 创建新的材料和质量配置文件。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "打印配置文件助手" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "已通过网络连接。" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index 3d45d6c7fd..2e104ef9bb 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index be85226206..1c2d9c688f 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -2,12 +2,12 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 14:18+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Chinese , PCDotFan , Chinese \n" @@ -1031,6 +1031,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "底层的数量。 在按底层厚度计算时，该值舍入为整数。" +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3982,8 +3992,8 @@ msgstr "最小支撑接触面面积" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "支撑接触面多边形的最小面积。将不会生成面积小于此值的多边形。" +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3992,8 +4002,8 @@ msgstr "最小支撑顶板面积" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "支撑顶板的最小面积。将不会生成面积小于此值的多边形。" +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4002,8 +4012,8 @@ msgstr "最小支撑底板面积" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "支撑底板的最小面积。将不会生成面积小于此值的多边形。" +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4789,6 +4799,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "移除第一个打印层下方的空白层（如果存在）。如果“切片公差”设置被设为“独占”或“中间”，禁用此设置可能导致空白第一层。" +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "最大分辨率" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "走线部分在切片后的最小尺寸。如果提高此值，网格的分辨率将降低。这可让打印机保持处理 g-code 所需的速度，并将通过移除无法处理的网格细节提高切片速度。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "空走的最大分辨率" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "切片后的旅行线路段的最小尺寸。如果你增加了这个，旅行的移动就会变得不那么平滑了。这可能使打印机能够跟上它处理g代码的速度，但是它可能导致模型的避免变得不那么准确。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "最大偏移量" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "降低“最大分辨率”设置的分辨率时允许的最大偏移量。如果增加该值，打印作业的准确性将降低，但 g-code 将减小。“最大偏移量”是“最大分辨率”的限制，因此如果两者冲突，则“最大偏移量”将始终保持有效。" + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5164,36 +5204,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "切片层中周长小于此数值的多边形将被滤除。以切片时间为代价，较低的值可实现较高分辨率的网格。它主要用于高分辨率 SLA 打印机和包含大量细节的极小 3D 模型。" -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "最大分辨率" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "走线部分在切片后的最小尺寸。如果提高此值，网格的分辨率将降低。这可让打印机保持处理 g-code 所需的速度，并将通过移除无法处理的网格细节提高切片速度。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "空走的最大分辨率" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "切片后的旅行线路段的最小尺寸。如果你增加了这个，旅行的移动就会变得不那么平滑了。这可能使打印机能够跟上它处理g代码的速度，但是它可能导致模型的避免变得不那么准确。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "最大偏移量" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "降低“最大分辨率”设置的分辨率时允许的最大偏移量。如果增加该值，打印作业的准确性将降低，但 g-code 将减小。“最大偏移量”是“最大分辨率”的限制，因此如果两者冲突，则“最大偏移量”将始终保持有效。" - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5334,16 +5344,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "滑行期间的移动速度，相对于挤出路径的速度。 建议采用略低于 100% 的值，因为在滑行移动期间鲍登管中的压力会下降。" -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "交替皮肤旋转" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "交替打印顶部/底部层的方向。 通常它们只进行对角线打印。 此设置添加仅限 X 和仅限 Y 的方向。" - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5516,23 +5516,23 @@ msgstr "在每个走线部分引入的随机点之间的平均距离。 注意 #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "流量补偿最大挤出偏移值" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "以毫米为单位的最大补偿距离。" +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "流量补偿因子" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "流量的倍增因子-> 距离转换。" +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,13 +5825,13 @@ msgstr "下一层与前一层的高度差。" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "自适应图层阈值" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "决定是否使用较小图层的阈值。该数字相当于一层中最大坡度的切线。" +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,8 +5840,8 @@ msgstr "悬垂壁角度" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "悬垂超过此角度的壁将使用悬垂壁设置打印。该值为 90 时，不会将任何壁视为悬垂。" +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,18 +6220,18 @@ msgstr "微小特征速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "第一层速度" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "第一层的微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6293,6 +6293,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撑接触面多边形的最小面积。将不会生成面积小于此值的多边形。" + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撑顶板的最小面积。将不会生成面积小于此值的多边形。" + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撑底板的最小面积。将不会生成面积小于此值的多边形。" + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "交替皮肤旋转" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "交替打印顶部/底部层的方向。 通常它们只进行对角线打印。 此设置添加仅限 X 和仅限 Y 的方向。" + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "流量补偿最大挤出偏移值" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "以毫米为单位的最大补偿距离。" + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "流量补偿因子" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "流量的倍增因子-> 距离转换。" + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "自适应图层阈值" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "决定是否使用较小图层的阈值。该数字相当于一层中最大坡度的切线。" + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "悬垂超过此角度的壁将使用悬垂壁设置打印。该值为 90 时，不会将任何壁视为悬垂。" + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "第一层速度" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "第一层的微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "再一次经过顶部表面，但不挤出材料。 这是为了进一步融化顶部的塑料，打造更平滑的表面。" From 3ed53a99f6320d9f95cb19363a9342daea4c8958 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 5 Nov 2019 13:32:11 +0100 Subject: [PATCH 891/994] Update missing translations from new translation template Contributes to issue CURA-6957. --- resources/i18n/de_DE/cura.po | 2 +- resources/i18n/de_DE/fdmextruder.def.json.po | 2 +- resources/i18n/de_DE/fdmprinter.def.json.po | 2 +- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/es_ES/fdmextruder.def.json.po | 2 +- resources/i18n/es_ES/fdmprinter.def.json.po | 2 +- resources/i18n/fi_FI/cura.po | 2 +- resources/i18n/fi_FI/fdmextruder.def.json.po | 2 +- resources/i18n/fi_FI/fdmprinter.def.json.po | 2 +- resources/i18n/fr_FR/cura.po | 2 +- resources/i18n/fr_FR/fdmextruder.def.json.po | 2 +- resources/i18n/fr_FR/fdmprinter.def.json.po | 2 +- resources/i18n/it_IT/cura.po | 2 +- resources/i18n/it_IT/fdmextruder.def.json.po | 2 +- resources/i18n/it_IT/fdmprinter.def.json.po | 2 +- resources/i18n/ja_JP/cura.po | 2 +- resources/i18n/ja_JP/fdmextruder.def.json.po | 2 +- resources/i18n/ja_JP/fdmprinter.def.json.po | 2 +- resources/i18n/ko_KR/cura.po | 2 +- resources/i18n/ko_KR/fdmextruder.def.json.po | 2 +- resources/i18n/ko_KR/fdmprinter.def.json.po | 2 +- resources/i18n/nl_NL/cura.po | 2 +- resources/i18n/nl_NL/fdmextruder.def.json.po | 2 +- resources/i18n/nl_NL/fdmprinter.def.json.po | 2 +- resources/i18n/pl_PL/cura.po | 2 +- resources/i18n/pl_PL/fdmextruder.def.json.po | 2 +- resources/i18n/pl_PL/fdmprinter.def.json.po | 2 +- resources/i18n/pt_BR/cura.po | 1219 +++++++++-------- resources/i18n/pt_BR/fdmextruder.def.json.po | 2 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 194 ++- resources/i18n/pt_PT/cura.po | 1225 ++++++++++-------- resources/i18n/pt_PT/fdmextruder.def.json.po | 2 +- resources/i18n/pt_PT/fdmprinter.def.json.po | 220 ++-- resources/i18n/ru_RU/cura.po | 1220 +++++++++-------- resources/i18n/ru_RU/fdmextruder.def.json.po | 2 +- resources/i18n/ru_RU/fdmprinter.def.json.po | 220 ++-- resources/i18n/tr_TR/cura.po | 1222 +++++++++-------- resources/i18n/tr_TR/fdmextruder.def.json.po | 2 +- resources/i18n/tr_TR/fdmprinter.def.json.po | 216 +-- resources/i18n/zh_CN/cura.po | 2 +- resources/i18n/zh_CN/fdmextruder.def.json.po | 2 +- resources/i18n/zh_CN/fdmprinter.def.json.po | 2 +- resources/i18n/zh_TW/cura.po | 1218 +++++++++-------- resources/i18n/zh_TW/fdmextruder.def.json.po | 2 +- resources/i18n/zh_TW/fdmprinter.def.json.po | 194 ++- 45 files changed, 4046 insertions(+), 3172 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 8b564fef55..9017b8b977 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index cc76886efc..9359989f87 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index a4709dff1e..d85ce1ed9d 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 122197a1b7..ce3a438694 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index ceeefc1529..04a118ec58 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 2651792d76..934e56c1d9 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 4ae527e04e..bf343a21fa 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index 1c4b135492..8985f36b7b 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index c0cec70153..6b510789f7 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 0e1ab565f1..79d0e86c5b 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index 3e58acfe03..7cde86a4a1 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index cc1fb22d67..f24930392f 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index ad4e6213df..495ffcade5 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index c1df4418a1..511f050b44 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 3a6f87353e..cdc0f63972 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 4b2c2f4300..dde04f0ff1 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 61388dc1d1..a4c9feed7e 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 9b4d26c209..6a88945fc5 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 20aa5bb60b..6a1c7134e6 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index 0d7374d265..bb0f37c410 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 7f191e0d3a..69d74667d7 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 074f67cd93..54ed0baa67 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index b30045a52a..d2950e0c07 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index a63be5e1ac..72524ef7dd 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 744bdbb100..783313bda3 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index f0b5eec019..3983ca9326 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 4d7f527a53..f0e76a3c21 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 1a9ca5fc90..3b29a33510 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-17 06:50-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Ajustes da Máquina" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Arquivo G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo binário." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Por favor prepare o G-Code antes de exportar." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Assistente de Modelo 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar Firmware" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Achatar os ajustes ativos" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "O perfil foi achatado & ativado." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Impressão em Progresso" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Grava em formato X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Arquivo X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Arquivo X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Não foi possível salvar em unidade removível {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -243,8 +218,8 @@ msgstr "Ejetar dispositivo removível {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprime pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado pela rede" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Erro de impressão" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "Imagem GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Malha Comprimida de Triângulos Aberta" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configurar ajustes por Modelo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Arquivo 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Bico" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O arquivo de projeto {0} contém um tipo de máquina desconhecido {1}. Não foi possível importar a máquina. Os modelos serão importados ao invés dela." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir Arquivo de Projeto" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Pré-visualização" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Login falhou" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Não Suportado" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O arquivo {0} já existe. Tem certeza que quer sobrescrevê-lo?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Os ajustes foram alterados para seguir a disponibilidade de extrusores atuais:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes atualizados" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Desconhecido" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Falha ao exportar perfil para {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Falha ao exportar perfil para {0}: complemento escritor relatou erro." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado para {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportação concluída" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Falha ao importar perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Não foi possível importar perfil de {0} antes de uma impressora ser adicionada." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Não há perfil personalizado a importar no arquivo {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Este perfil {0} contém dados incorretos, não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado com sucesso" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Arquivo {0} não contém nenhum perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O Perfil {0} tem tipo de arquivo desconhecido ou está corrompido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Falta um tipo de qualidade ao Perfil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Arquivo pré-fatiado {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Próximo" @@ -962,9 +954,9 @@ msgstr "Grupo #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -979,40 +971,85 @@ msgstr "Adicionar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Não sobreposto" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Perfis personalizados" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Todos Os Tipos Suportados ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos Os Arquivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Desconhecido" +msgid "Custom Material" +msgstr "Material Personalizado" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personalizado" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Impressoras de rede disponíveis" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Material Personalizado" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personalizado" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não foi possível contactar o servidor de contas da Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Tentar novamente" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Carregando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando cena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Carregando interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado é pequenos demais para carregar." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Ajustes de Impressora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (largura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profundidade)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forma da plataforma de impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origem no centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Mesa aquecida" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volume de construção aquecido" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Sabor de G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ajustes da Cabeça de Impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X máx." @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Altura do Eixo" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code Inicial" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code Final" @@ -1477,7 +1503,7 @@ msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Máquina" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Núcleo de Impressão" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Remover" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Endereço" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impressora é a hospedeira de um grupo de %1 impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "A impressora neste endereço ainda não respondeu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Por favor entre um endereço IP válido." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Entre o endereço IP da sua impressora na rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina %1 em %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Imprimir" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Imprimir pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Imprimir" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Seleção de impressora" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavização" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Tipo de Malha" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modelo normal" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Imprimir como suporte" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Não suportar sobreposição com outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modificar ajustes para sobrepor com outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modificar ajustes para preenchimento de outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Selecionar ajustes" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Exibir tudo" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Tipo de Malha" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modelo normal" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Imprimir como suporte" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Selecionar ajustes" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Atualizar existente" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Criar novo" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Atualizar" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Criar novo" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "Grupo de Impressora" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" @@ -2539,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Como o conflito no perfil deve ser resolvido?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 sobreposto" msgstr[1] "%1 sobrepostos" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 sobreposição" msgstr[1] "%1, %2 sobreposições" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Ajustes de material" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Como o conflito no material deve ser resolvido?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidade dos ajustes" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Ajustes visíveis:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Carregar um projeto limpará todos os modelos da mesa de impressão." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Criar um backup automaticamente toda vez que o Cura iniciar." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Não suportado" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Dica" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Imprimir experimento" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificação" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Bloco Olsson" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem certeza que deseja abortar a impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informação" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar Mudança de Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "O novo diâmetro de filamento está ajustado em %1 mm, que não é compatível com o extrusor atual. Você deseja continuar?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Exibir Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Tipo de Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Cor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Propriedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Custo do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Peso do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Comprimento do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Custo por Metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está vinculado a %1 e compartilha algumas de suas propriedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Desvincular Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Descrição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informação sobre Aderência" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com sucesso" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha em exportar material para %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado para %1 com sucesso" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Verificar tudo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calculado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Atual" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unidade" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Você precisará reiniciar a aplicação para que essas mudanças tenham efeito." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Fatiar automaticamente quando mudar ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Fatiar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da área de visualização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Ressaltar áreas sem suporte do modelo em vermelho. Sem suporte, estas áreas não serão impressas corretamente." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Exibir seções pendentes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmera de modo que o modelo fique no centro da visão quando for selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centralizar câmera quanto o item é selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento default de ampliação deve ser invertido?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverter a direção da ampliação de câmera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "A ampliação (zoom) deve se mover na direção do mouse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Ampliar com o mouse não é suportado na perspectiva ortográfica." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Ampliar na direção do mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos devem ser movidos na plataforma de modo que não se sobreponham?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assegurar que os modelos sejam mantidos separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Os modelos devem ser movidos pra baixo pra se assentar na plataforma de impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automaticamente fazer os modelos caírem na mesa de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Exibir mensagem de alerta no leitor de G-Code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de alera no leitor de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A Visão de Camada deve ser forçada a ficar em modo de compatibilidade?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar modo de compatibilidade da visão de camadas (requer reinício)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Que tipo de renderização de câmera deve ser usada?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Renderização de câmera:" +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspectiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortográfica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrindo e salvando arquivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados dentro do volume de impressão se forem muito grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode ser carregado diminuto se sua unidade for por exemplo em metros ao invés de milímetros. Devem esses modelos ser redimensionados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos minúsculos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Os modelos devem ser selecionados após serem carregados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar modelos ao carregar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Um prefixo baseado no nome da impressora deve ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo de máquina ao nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Um resumo deve ser exibido ao salvar um arquivo de projeto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Exibir diálogo de resumo ao salvar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento default ao abrir um arquivo de projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento default ao abrir um arquivo de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Sempre me perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Sempre abrir como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Sempre importar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento default para valores de configuração alterados ao mudar para um perfil diferente: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Sempre descartar alterações da configuração" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Sempre transferir as alterações para o novo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve verificar novas atualizações quando o programa for iniciado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Verificar atualizações na inicialização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar informação (anônima) de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimental" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Usar funcionalidade de plataforma múltipla de impressão" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Usar funcionalidade de plataforma múltipla de impressão (reinício requerido)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "Impressoras" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Criar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Por favor dê um nome a este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renomear Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Perfis default" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Perfis personalizados" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil usa os defaults especificados pela impressora, portanto não tem ajustes/sobreposições na lista abaixo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Seus ajustes atuais coincidem com o perfil selecionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globais" @@ -3515,35 +3489,35 @@ msgstr "Sem Título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "procurar nos ajustes" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não exibir este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter este ajuste visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afetado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Este ajuste é sempre compartilhado entre todos os extrusores. Modificá-lo aqui mudará o valor para todos." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "O valor é resolvido de valores específicos de cada extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3570,7 @@ msgstr "" "\n" "Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3581,13 @@ msgstr "" "\n" "Clique para restaurar o valor calculado." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Habilita imprimir um brim (bainha) ou raft (jangada). Adicionará uma área chata em volta ou sob o objeto que é fácil de remover após a impressão ter finalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Altura de Camada" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Você modificou alguns ajustes de perfil. Se você quiser alterá-los, use o modo personalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Este perfil de qualidade não está disponível para seu material e configuração de bico atuais. Por favor, altere-os para habilitar este perfil de qualidade." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Um perfil personalizado está atualmente ativo. Para habilitar o controle deslizante de qualidade, escolha um perfil de qualidade default na aba Personalizado" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Off" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimental" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3664,11 @@ msgstr "" "\n" "Clique para abrir o gerenciador de perfis." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desabilitar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "Plataforma de Impressão (&B)" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Perfil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configurações" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Selecione configuração" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configurações" @@ -3984,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Habilitado" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Use cola para melhor aderência com essa combinação de materiais." @@ -4406,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechando o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Você tem certeza que deseja sair do Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir Arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontramos um ou mais arquivos de G-Code entre os arquivos que você selecionou. Você só pode abrir um arquivo de G-Code por vez. Se você quiser abrir um arquivo de G-Code, por favor selecione somente um." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -4514,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Sobre o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versão: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solução completa para impressão 3D com filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4504,122 @@ msgstr "" "Cura é desenvolvido pela Ultimaker B.V. em cooperação com a comunidade.\n" "Cura orgulhosamente usa os seguintes projetos open-source:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface Gráfica de usuário" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Framework de Aplicações" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Gerador de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicação interprocessos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Linguagem de Programação" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Ligações da Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de Ligações C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de Intercâmbio de Dados" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Bibliteca de suporte para computação científica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de suporte para matemática acelerada" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de suporte para manuseamento de arquivos STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Biblioteca de suporte para manuseamento de objetos planares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Biblioteca de suporte para manuseamento de malhas triangulares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Biblioteca de suporte para análises de redes complexas" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de suporte para manuseamento de arquivos 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Biblioteca de suporte para streaming e metadados de arquivo" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicação serial" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de descoberta 'ZeroConf'" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recorte de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca de HTTP Python" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Fonte" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação de aplicação multidistribuição em Linux" @@ -4668,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salvar Projeto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Plataforma de Impressão" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Não exibir resumo do projeto ao salvar novamente" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Salvar" @@ -4869,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Resolução de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nome da impressora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Por favor dê um nome à sua impressora" @@ -4933,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Começar" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Verificador de Modelo" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Descarrega o conteúdo de todas as configurações em um arquivo HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Modo Deus" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Atualizador de Firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Cria um perfil de mudanças de qualidade achatado." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Achatador de Perfil" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Atualização de Versão de 3.3 para 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de Perfis do Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente de Perfil de Impressão" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis do Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Achatar os ajustes ativos" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "O perfil foi achatado & ativado." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Grava em formato X3g" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Arquivo X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Arquivo X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Malha Comprimida de Triângulos Aberta" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Tentar novamente" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Núcleo de Impressão" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Não suportar sobreposição com outros modelos" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modificar ajustes para sobrepor com outros modelos" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modificar ajustes para preenchimento de outros modelos" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Atualizar existente" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Não suportado" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Dica" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Imprimir experimento" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificação" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Bloco Olsson" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Renderização de câmera:" + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Usar funcionalidade de plataforma múltipla de impressão" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Usar funcionalidade de plataforma múltipla de impressão (reinício requerido)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Perfis default" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "procurar nos ajustes" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Altura de Camada" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Este perfil de qualidade não está disponível para seu material e configuração de bico atuais. Por favor, altere-os para habilitar este perfil de qualidade." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Um perfil personalizado está atualmente ativo. Para habilitar o controle deslizante de qualidade, escolha um perfil de qualidade default na aba Personalizado" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "Plataforma de Impressão (&B)" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Perfil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Plataforma de Impressão" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Descarrega o conteúdo de todas as configurações em um arquivo HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Modo Deus" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Cria um perfil de mudanças de qualidade achatado." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Achatador de Perfil" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente de Perfil de Impressão" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Conectado pela rede." diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index b5a9dd2070..b062ad2883 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-18 11:27+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 8faf6be4a9..da63b1190e 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-22 21:19-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" @@ -1031,6 +1031,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, este valor é arredondado para um inteiro." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3982,8 +3992,8 @@ msgstr "Área Mínima de Interface de Suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para polígonos de interface de suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3992,8 +4002,8 @@ msgstr "Área Mínima de Teto de Suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para os tetos do suporte. Polígonos que tiverem área menor que este valor são serão gerados." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4002,8 +4012,8 @@ msgstr "Área Mínima de Base de Suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para as bases do suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4789,6 +4799,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Remove camadas vazias entre a primeira camada impressa se estiverem presentes. Desabilitar este ajuste pode criar camadas iniciais vazias se a Tolerância de Fatiamento estiver configurada para Exclusivo ou Meio." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Resolução Máxima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "O tamanho mínimo de um segmento de linha após o fatiamento. Se você aumentar este valor, a malha terá uma resolução menor. Isto pode permitir que a impressora mantenha a velocidade que precisa para processar o G-Code e aumentará a velocidade de fatiamento ao remover detalhes da malha que não poderia processar de qualquer jeito." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Máxima Resolução de Percurso" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "O tamanho mínimo de um segmento de linha de percurso após o fatiamento. Se o valor aumenta, os movimentos de percurso terão cantos menos suaves. Isto pode permitir que a impressora mantenha a velocidade necessária para processar o G-Code, mas pode fazer com que evitar topar no modelo fique menos preciso." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Desvio Máximo" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "O desvio máximo permitido ao reduzir a resolução para o ajuste de Máxima Resolução. Se você aumentar isto, a impressão será menos precisa, mas o G-Code será menor. O Desvio Máximo é um limite para Resolução Máxima, portanto se os dois conflitarem o Desvio Máximo sempre será o valor dominante." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5164,36 +5204,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polígonos em camadas fatiadas que tiverem uma circunferência menor que esta quantia serão excluídos. Menores valores levam a malha de maior resolução ao custo de tempo de fatiamento. Serve melhor para impressoras SLA de alta resolução e pequenos modelos 3D com muitos detalhes." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Resolução Máxima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "O tamanho mínimo de um segmento de linha após o fatiamento. Se você aumentar este valor, a malha terá uma resolução menor. Isto pode permitir que a impressora mantenha a velocidade que precisa para processar o G-Code e aumentará a velocidade de fatiamento ao remover detalhes da malha que não poderia processar de qualquer jeito." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Máxima Resolução de Percurso" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "O tamanho mínimo de um segmento de linha de percurso após o fatiamento. Se o valor aumenta, os movimentos de percurso terão cantos menos suaves. Isto pode permitir que a impressora mantenha a velocidade necessária para processar o G-Code, mas pode fazer com que evitar topar no modelo fique menos preciso." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Desvio Máximo" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "O desvio máximo permitido ao reduzir a resolução para o ajuste de Máxima Resolução. Se você aumentar isto, a impressão será menos precisa, mas o G-Code será menor. O Desvio Máximo é um limite para Resolução Máxima, portanto se os dois conflitarem o Desvio Máximo sempre será o valor dominante." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5334,16 +5344,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "A velocidade pela qual se mover durante a desengrenagem, relativa à velocidade do caminho de extrusão. Um valor ligeiramente menor que 100% é sugerido, já que durante a desengrenagem a pressão dentro do hotend cai." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Alterna a Rotação do Contorno" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterna a direção em que as camadas superiores e inferiores são impressas. Normalmente elas são impressas somente na diagonal. Este ajuste permite direções somente no X e somente no Y." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5516,23 +5516,23 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "A distância máxima em mm a compensar." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Fator de compensaçõ de taxa de fluxo" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "O fator de multiplicação para a tradução entre taxa de fluxo -> distância." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,13 +5825,13 @@ msgstr "A diferença em tamanho da próxima camada comparada à anterior." #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Limite das Camadas Adaptativas" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Limite até onde se usa uma camada menor ou não. Este número é comparado à tangente da ladeira mais vertical da camada." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,8 +5840,8 @@ msgstr "Ângulo de Parede Pendente" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Paredes que têm inclinação maior que este ângulo serão impressas usando ajustes de seção pendente de parede. Quando o valor for 90, nenhuma parede será tratada como seção pendente." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,18 +6220,18 @@ msgstr "Velocidade de Aspecto Pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Pequenos aspectos serão impressos com esta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Velocidade da Primeira Camada" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6293,6 +6293,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo após o carregamento do arquivo." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para polígonos de interface de suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para os tetos do suporte. Polígonos que tiverem área menor que este valor são serão gerados." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para as bases do suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Alterna a Rotação do Contorno" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterna a direção em que as camadas superiores e inferiores são impressas. Normalmente elas são impressas somente na diagonal. Este ajuste permite direções somente no X e somente no Y." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "A distância máxima em mm a compensar." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Fator de compensaçõ de taxa de fluxo" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "O fator de multiplicação para a tradução entre taxa de fluxo -> distância." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Limite das Camadas Adaptativas" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Limite até onde se usa uma camada menor ou não. Este número é comparado à tangente da ladeira mais vertical da camada." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Paredes que têm inclinação maior que este ângulo serão impressas usando ajustes de seção pendente de parede. Quando o valor for 90, nenhuma parede será tratada como seção pendente." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Pequenos aspectos serão impressos com esta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Velocidade da Primeira Camada" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Passar sobre a superfície superior depois de impressa, mas sem extrudar material. A idéia é derreter o plástico do topo ainda mais, criando uma superfície mais lisa." diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 13f2b75135..d7defa46bc 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" "Language-Team: Portuguese , Paulo Miranda , Portuguese \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.7\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Definições da Máquina" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Ficheiro G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo sem texto." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Prepare um G-code antes de exportar." @@ -57,7 +57,7 @@ msgid "3D Model Assistant" msgstr "Assistente de Modelos 3D" # rever! -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -76,19 +76,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar firmware" -# rever! -# flatten -ver contexto! -# nivelar? -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Nivelar Definições Ativas" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "O perfil foi nivelado & ativado." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -129,21 +116,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Impressão em curso" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Grava X3g num ficheiro" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Ficheiro X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Ficheiro X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -217,9 +189,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Não foi possível guardar no Disco Externo {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -252,8 +224,8 @@ msgstr "Ejetar Disco Externo {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -285,17 +257,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ligar Através da Rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprimir através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Ligado através da rede" @@ -310,6 +282,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Erro de impressão" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -510,9 +497,9 @@ msgid "GIF Image" msgstr "Imagem GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -603,12 +590,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configurar definições individuais Por-Modelo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -619,19 +606,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Ficheiro 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O ficheiro de projeto {0} contém um tipo de máquina desconhecido {1}. Não é possível importar a máquina. Em vez disso, serão importados os modelos." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir ficheiro de projeto" @@ -711,16 +698,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente de perfis" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente de perfis" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -741,7 +718,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Pré-visualizar" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -757,134 +733,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Falha no início de sessão" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Não suportado" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Ficheiro Já Existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O ficheiro {0} já existe. Tem a certeza de que deseja substituí-lo?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de ficheiro inválido:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "As definições foram alteradas de forma a corresponder aos extrusores disponíveis de momento:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Definições atualizadas" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) desativado(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Desconhecido" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Falha ao exportar perfil para {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Falha ao exportar perfil para {0}: O plug-in de gravação comunicou uma falha." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado para {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportação bem-sucedida" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Falha ao importar perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Não é possível importar o perfil de {0} antes de ser adicionada uma impressora." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Nenhum perfil personalizado para importar no ficheiro {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Falha ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "O perfil {0} contém dados incorretos, não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Falha ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado com êxito" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "O ficheiro {0} não contém qualquer perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O perfil {0} é de um formato de ficheiro desconhecido ou está corrompido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "O perfil não inclui qualquer tipo de qualidade." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -950,14 +940,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Outro" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Ficheiro pré-seccionado {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Seguinte" @@ -971,9 +960,9 @@ msgstr "Grupo #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -988,42 +977,87 @@ msgstr "Adicionar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Manter" +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Perfis personalizados" + # rever! # contexto -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Todos os Formatos Suportados ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos os Ficheiros (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Desconhecido" +msgid "Custom Material" +msgstr "Material Personalizado" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personalizado" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1035,17 +1069,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Impressoras em rede disponíveis" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Material Personalizado" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personalizado" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1081,11 +1104,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não é possível aceder ao servidor da conta Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Tentar de Novo" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1275,62 +1293,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "A carregar máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "A configurar cenário..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "A carregar interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Apenas pode ser carregado um ficheiro G-code de cada vez. Importação {0} ignorada" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir outro ficheiro enquanto o G-code estiver a carregar. Importação {0} ignorada" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado era demasiado pequeno para carregar." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Definições da impressora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Largura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1339,57 +1362,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profundidade)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forma da base de construção" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origem no centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Base aquecida" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volume de construção aquecido" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Variante do G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Definições da cabeça de impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X mín" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y mín" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X máx" @@ -1399,22 +1422,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y máx" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Altura do pórtico" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code inicial" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-code final" @@ -1493,7 +1516,7 @@ msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1688,11 +1711,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Máquina" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print Core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1949,9 +1967,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Remover" @@ -1972,61 +1990,61 @@ msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Versão de Firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Endereço" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impressora não está configurada para alojar um grupo de impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impressora aloja um grupo de %1 impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "A impressora neste endereço ainda não respondeu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Ligar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Introduza um endereço IP válido." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Introduza o endereço IP da sua impressora na rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2083,17 +2101,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina %1 a %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Imprimir" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Imprimir Através da Rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Imprimir" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Seleção de Impressora" @@ -2448,72 +2466,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavização" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Tipo de Objecto" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modelo normal" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Imprimir como suporte" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Retirar suportes na intercepção com outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Alterar as definições dos objetos que intercepta" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modificar definições do enchimento de outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Selecionar definições" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar definições a personalizar para este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar tudo" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Tipo de Objecto" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modelo normal" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Imprimir como suporte" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Selecionar definições" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Atualizar existente" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Criar nova" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2538,6 +2555,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Atualizar" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Criar nova" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2551,7 +2573,7 @@ msgid "Printer Group" msgstr "Grupo da Impressora" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Definições do perfil" @@ -2562,77 +2584,83 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Como deve ser resolvido o conflito no perfil?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Inexistente no perfil" # rever! # contexto?! -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 substituição" msgstr[1] "%1 substituições" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 substituição" msgstr[1] "%1, %2 substituições" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Definições de material" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Como deve ser resolvido o conflito no material?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidade das definições" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Definições visíveis:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Abrir um projeto irá apagar todos os modelos na base de construção." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -2739,54 +2767,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Criar automaticamente uma cópia de segurança sempre que o Cura é iniciado." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Não suportado" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Sugestão" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Experimento de impressão" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificação" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Selecione quaisquer atualizações realizadas a esta Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2872,170 +2852,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem a certeza de que deseja cancelar a impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar Alteração de Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "O novo diâmetro do filamento está definido como %1 mm, o que não é compatível com o extrusor actual. Pretende prosseguir?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Tipo de Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Cor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Propriedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Custo do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Peso do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Comprimento do filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Custo por Metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está associado a %1 e partilha algumas das suas propriedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Desassociar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Descrição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informações de Aderência" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Definições de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem a certeza de que deseja remover o perfil %1? Não é possível desfazer esta ação!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar o material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com êxito" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha ao exportar material para %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado com êxito para %1" @@ -3050,27 +3036,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Selecionar tudo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calculado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Definição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Atual" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unidade" @@ -3081,311 +3067,305 @@ msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "É necessário reiniciar a aplicação para que estas alterações sejam aplicadas." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seccionar automaticamente ao alterar as definições." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seccionar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da janela" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Realçar, a vermelho, as áreas do modelo sem apoio. Sem suporte, estas áreas podem não ser impressas correctamente." # rever! # consolas? -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar Saliências (Overhangs)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmara de forma que o modelo fique no centro da visualização quando é selecionado um modelo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar câmara ao selecionar item" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento de zoom predefinido do Cura deve ser invertido?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverta a direção do zoom da câmera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "O zoom deve deslocar-se na direção do rato?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Fazer zoom em direção ao rato não é suportado na perspetiva ortográfica." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Fazer Zoom na direção do rato" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos, na plataforma, devem ser movidos para que não se intersectem?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Garantir que os modelos não se interceptam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pousar os modelos na base de construção?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pousar automaticamente os modelos na base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Mostrar mensagem de aviso no leitor de g-code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de aviso no leitor de g-code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A vista por camada deve ser forçada a utilizar o modo de compatibilidade?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar o modo de compatibilidade na visualização por camada (é necessário reiniciar)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Que tipo de composição de câmara deve ser utilizado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Composição de câmara: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspetiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortográfica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir e guardar ficheiros" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados até ao volume de construção se forem demasiado grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos demasiado grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode parecer extremamente pequeno se, por exemplo, este tiver sido criado em metros e não em milímetros. Estes modelos devem ser redimensionados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos extremamente pequenos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Selecionar os modelos depois de abertos?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar os modelos depois de abertos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Deve um prefixo com base no nome da impressora ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo da máquina ao nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Deve ser apresentado um resumo ao guardar um ficheiro de projeto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar caixa de diálogo de resumo ao guardar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinido ao abrir um ficheiro de projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinido ao abrir um ficheiro de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir sempre como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar sempre modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando tiver realizado alterações a um perfil e mudado para outro, será apresentada uma caixa de diálogo a perguntar se pretende manter as alterações. Caso contrário, pode escolher um comportamento predefinido, sendo que a caixa de diálogo nunca mais é apresentada." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinido para valores de definição alterados ao mudar para um perfil diferente: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar sempre definições alteradas" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir sempre definições alteradas para o novo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve procurar atualizações quando o programa é iniciado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Procurar atualizações ao iniciar" # rever! # legal wording -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Podem alguns dados anónimos sobre a impressão ser enviados para a Ultimaker? Não são enviadas, nem armazenadas, quaisquer informações pessoais, incluindo modelos, endereços IP ou outro tipo de identificação pessoal." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar dados (anónimos) sobre a impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimental" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Usar a funcionalidade de múltiplas bases de construção" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Usar a funcionalidade de múltiplas bases de construção (é necessário reiniciar)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3393,93 +3373,84 @@ msgid "Printers" msgstr "Impressoras" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Mudar Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Criar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Forneça um nome para este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Mudar Nome do Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Perfis predefinidos" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Perfis personalizados" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com as definições/substituições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar alterações atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza as predefinições especificadas pela impressora, pelo que não tem quaisquer definições/substituições na lista seguinte." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "As suas definições atuais correspondem ao perfil selecionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Definições Globais" @@ -3544,35 +3515,35 @@ msgstr "Sem título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "procurar definições" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Esconder esta definição" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não mostrar esta definição" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter esta definição visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3613,7 +3584,7 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Modificado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Esta definição é sempre partilhada entre todos os extrusores. Ao alterá-la aqui, o valor será alterado em todos os extrusores." @@ -3622,12 +3593,12 @@ msgstr "Esta definição é sempre partilhada entre todos os extrusores. Ao alte # contexto?! # resolvido? # por-extrusor -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "O valor é calculado com base nos valores por-extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3638,7 +3609,7 @@ msgstr "" "\n" "Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3649,6 +3620,13 @@ msgstr "" "\n" "Clique para restaurar o valor calculado." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3692,26 +3670,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Permite a impressão de uma aba ou raft. Isto irá adicionar, respetivamente, uma área plana em torno ou sob a base do seu objeto, que são fáceis de retirar posteriormente." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Espessura das Camadas" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Algumas definições do perfil foram modificadas. Se pretender alterá-las, aceda ao modo Personalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Este perfil de qualidade não se encontra disponível para a sua configuração atual de material e de nozzle. Altere-a para ativar este perfil de qualidade." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "De momento está ativo um perfil personalizado. Para poder ativar o controlo de qualidade, por favor selecione um dos perfis de qualidade predefinidos no modo Personalizado" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3722,12 +3685,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Desligado" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimental" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3738,6 +3706,11 @@ msgstr "" "\n" "Clique para abrir o gestor de perfis." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3871,11 +3844,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3911,16 +3889,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desativar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Base de construção" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Perfil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -4000,12 +3968,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configurações" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Selecionar configuração" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configurações" @@ -4035,12 +4003,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Ativado" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilizar cola para melhor aderência com esta combinação de materiais." @@ -4459,44 +4427,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Definições" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechar Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Tem a certeza de que deseja sair do Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir ficheiro(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir ficheiro(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontrámos um ou mais ficheiros G-code nos ficheiros selecionados. Só é possível abrir um ficheiro G-code de cada vez. Se pretender abrir um ficheiro G-code, selecione apenas um." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -4567,17 +4535,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Sobre o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versão: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "A Solução completa para a impressão 3D por filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4586,125 +4554,125 @@ msgstr "" "O Cura foi desenvolvido pela Ultimaker B.V. em colaboração com a comunidade.\n" "O Cura tem o prazer de utilizar os seguintes projetos open source:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface gráfica do utilizador" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Framework da aplicação" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Gerador de G-code" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicação interprocessual" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Linguagem de programação" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI framework" # rever! # use eng programing terms? -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Ligações de estrutura da GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de ligações C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de intercâmbio de dados" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Biblioteca de apoio para computação científica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de apoio para cálculos mais rápidos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de apoio para processamento de ficheiros STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Biblioteca de apoio para processamento de objetos planos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Biblioteca de apoio para processamento de malhas triangulares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Biblioteca de apoio para análise de redes complexas" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de apoio para processamento de ficheiros 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Biblioteca de apoio para transmissões de fluxo e metadados de ficheiros" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicação em série" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de deteção ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recortes de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca de HTTP Python" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Tipo de letra" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" # rever! -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação da aplicação de distribuição cruzada Linux" @@ -4724,32 +4692,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Base de construção" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Não mostrar novamente o resumo do projeto ao guardar" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Guardar" @@ -4925,12 +4888,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Resolução de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nome da impressora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Atribua um nome à sua impressora" @@ -4989,6 +4952,31 @@ msgctxt "@button" msgid "Get started" msgstr "Iniciar" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5049,16 +5037,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Verificador de Modelos" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Descarregar o conteúdo de todas as definições para um ficheiro HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Modo God" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5069,16 +5047,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Atualizador de firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Cria um perfil de alterações de qualidade aplanado." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Aplanador de perfis" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5280,6 +5248,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Atualização da versão 3.3 para 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5482,16 +5460,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de perfis Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite aos fabricantes de materiais criar novos materiais e perfis de qualidade utilizando uma IU de fácil acesso." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente de perfis de impressão" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5532,6 +5500,161 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis Cura" +# rever! +# flatten -ver contexto! +# nivelar? +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Nivelar Definições Ativas" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "O perfil foi nivelado & ativado." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Grava X3g num ficheiro" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Ficheiro X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Ficheiro X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de perfis" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de perfis" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Tentar de Novo" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print Core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Retirar suportes na intercepção com outros modelos" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Alterar as definições dos objetos que intercepta" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modificar definições do enchimento de outros modelos" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Atualizar existente" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Não suportado" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Sugestão" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Experimento de impressão" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificação" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Selecione quaisquer atualizações realizadas a esta Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Composição de câmara: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Usar a funcionalidade de múltiplas bases de construção" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Usar a funcionalidade de múltiplas bases de construção (é necessário reiniciar)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Perfis predefinidos" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "procurar definições" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Espessura das Camadas" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Este perfil de qualidade não se encontra disponível para a sua configuração atual de material e de nozzle. Altere-a para ativar este perfil de qualidade." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "De momento está ativo um perfil personalizado. Para poder ativar o controlo de qualidade, por favor selecione um dos perfis de qualidade predefinidos no modo Personalizado" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Base de construção" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Perfil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Base de construção" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Descarregar o conteúdo de todas as definições para um ficheiro HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Modo God" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Cria um perfil de alterações de qualidade aplanado." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Aplanador de perfis" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite aos fabricantes de materiais criar novos materiais e perfis de qualidade utilizando uma IU de fácil acesso." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente de perfis de impressão" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Ligado através da rede." diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index 5db0128890..3488999fd6 100644 --- a/resources/i18n/pt_PT/fdmextruder.def.json.po +++ b/resources/i18n/pt_PT/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-14 14:15+0100\n" "Last-Translator: Portuguese \n" "Language-Team: Paulo Miranda , Portuguese \n" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 06b3051b93..d58ebe8b44 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" "Language-Team: Portuguese , Paulo Miranda , Portuguese \n" @@ -1049,6 +1049,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "O número de camadas inferiores. Quando calculado através da Espessura Inferior, este valor é arredondado para um número inteiro." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1472,9 +1482,7 @@ msgstr "Ativar Engomar (Ironing)" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Passar novamente sobre o revestimento superior, mas desta vez extrudindo muito pouco material. O objetivo é derreter mais o plástico da camada superior," -" criando uma superfície mais suave. A pressão na câmara do nozzle é mantida elevada de modo que os vincos existentes na superfície sejam preenchidos com" -" material." +msgstr "Passar novamente sobre o revestimento superior, mas desta vez extrudindo muito pouco material. O objetivo é derreter mais o plástico da camada superior, criando uma superfície mais suave. A pressão na câmara do nozzle é mantida elevada de modo que os vincos existentes na superfície sejam preenchidos com material." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -3693,9 +3701,7 @@ msgstr "Direção da linha de enchimento do suporte" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas" -" progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses" -" retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos de 0 graus." +msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos de 0 graus." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -4112,8 +4118,8 @@ msgstr "Área mínima da interface de suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamanho mínimo da área para polígonos da interface de suporte. Os polígonos com uma área inferior a este valor não serão gerados." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4122,8 +4128,8 @@ msgstr "Área mínima do teto de suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamanho mínimo da área para os tetos de suporte. Os polígonos com uma área inferior a este valor não serão gerados." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4132,8 +4138,8 @@ msgstr "Área mínima do piso de suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Tamanho mínimo da área para os pisos de suporte. Os polígonos com uma área inferior a este valor não serão gerados." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4173,10 +4179,7 @@ msgstr "Direções da linha da interface do suporte" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas" -" progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses" -" retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem" -" bastante espessas ou 90 graus)." +msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem bastante espessas ou 90 graus)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4186,10 +4189,7 @@ msgstr "Direções da linha do teto do suporte" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Uma lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas" -" progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses" -" retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem" -" bastante espessas ou 90 graus)." +msgstr "Uma lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem bastante espessas ou 90 graus)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4199,10 +4199,7 @@ msgstr "Direções da linha do piso do suporte" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas" -" progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses" -" retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem" -" bastante espessas ou 90 graus)." +msgstr "Lista de ângulos (números inteiros) relativos às direções de linha a utilizar. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito, a lista está vazia, o que significa a utilização dos ângulos predefinidos (que alternam entre 45 e 135 graus se as interfaces forem bastante espessas ou 90 graus)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4949,6 +4946,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Remove as camadas vazias por baixo da primeira camada impressa, se existirem. Desativar esta definição pode causar primeiras camadas vazias, se a definição Tolerância de Seccionamento estiver definida como Exclusivo ou Centro." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Resolução Máxima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "O tamanho mínimo de um segmento após o seccionamento. Se aumentar este valor, a malha terá uma resolução menor. Isto poderá permitir que a impressora acompanhe a velocidade que tem para processar o G-code e irá aumentar a velocidade de seccionamento ao remover os detalhes da malha que não podem ser processados." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Resolução Máxima Deslocação" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "O tamanho mínimo de um segmento de deslocação após o seccionamento. Se aumentar este valor, o movimento de deslocação nos cantos será menos suave. Isto poderá permitir que a impressora acompanhe a velocidade que tem para processar o G-code, mas pode reduzir a precisão do movimento ao evitar as peças já impressas." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Desvio máximo" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "O desvio máximo permitido ao reduzir a resolução da definição de Resolução máxima. Se aumentar esta definição, a impressão será menos precisa, mas o G-code será menor. O Desvio máximo é um limite para a Resolução máxima, pelo que, se estiverem em conflito, o Desvio máximo é sempre considerado verdadeiro." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5334,37 +5361,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Os polígonos em camadas seccionadas que apresentem uma circunferência mais pequena do que este valor serão filtrados. Valores mais reduzidos originam malhas de resolução superior à custa do tempo de seccionamento. Destina-se principalmente a impressoras SLA de alta resolução e a modelos 3D muito pequenos com muitos detalhes." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Resolução Máxima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "O tamanho mínimo de um segmento após o seccionamento. Se aumentar este valor, a malha terá uma resolução menor. Isto poderá permitir que a impressora acompanhe a velocidade que tem para processar o G-code e irá aumentar a velocidade de seccionamento ao remover os detalhes da malha que não podem ser processados." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Resolução Máxima Deslocação" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "O tamanho mínimo de um segmento de deslocação após o seccionamento. Se aumentar este valor, o movimento de deslocação nos cantos será menos suave. Isto poderá permitir que a impressora acompanhe a velocidade que tem para processar o G-code, mas pode reduzir a precisão do movimento ao evitar as peças já impressas." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Desvio máximo" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "O desvio máximo permitido ao reduzir a resolução da definição de Resolução máxima. Se aumentar esta definição, a impressão será menos precisa, mas o G-code" -" será menor. O Desvio máximo é um limite para a Resolução máxima, pelo que, se estiverem em conflito, o Desvio máximo é sempre considerado verdadeiro." - # rever! # Is the english string correct? for the label? # -Break up @@ -5519,16 +5515,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "A velocidade de movimento durante a desaceleração, relativa à velocidade do caminho de extrusão. É recomendado um valor ligeiramente abaixo de 100%, uma vez que durante o movimento de desaceleração, a pressão no tubo Bowden diminui." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Alternar Rotação Revestimento" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterna a direção na qual as camadas superiores/inferiores são impressas. Geralmente, estas são impressas apenas na diagonal. Esta definição adiciona também as direções só em X e só em Y." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5701,23 +5687,23 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Desvio de extrusão máximo de compensação da taxa de fluxo" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "A distância máxima em milímetros a ser compensada." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Fator de compensação da taxa de fluxo" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "O fator de multiplicação da taxa de fluxo -> translação de distância." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -6010,13 +5996,13 @@ msgstr "A diferença de espessura da camada seguinte em comparação com a anter #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Limiar das camadas adaptáveis" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "O limiar em que se deve usar, ou não, uma menor espessura de camada. Este número é comparado com a tangente da inclinação mais acentuada numa camada." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -6025,8 +6011,8 @@ msgstr "Ângulo da parede de saliências" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "As paredes que se salientam mais do que este ângulo serão impressas utilizando definições de parede de saliências. Quando o valor é 90, nenhuma parede será tratada como saliente." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6405,20 +6391,18 @@ msgstr "Velocidade de elemento pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Os elementos pequenos serão impressos a esta percentagem da velocidade de impressão normal. A impressão mais lenta poderá contribuir para uma maior aderência" -" e precisão." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Velocidade da primeira camada" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Os elementos pequenos da primeira camada serão impressos a esta percentagem da velocidade de impressão normal. A impressão mais lenta poderá contribuir" -" para uma maior aderência e precisão." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6480,6 +6464,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo quando abrir o ficheiro." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamanho mínimo da área para polígonos da interface de suporte. Os polígonos com uma área inferior a este valor não serão gerados." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamanho mínimo da área para os tetos de suporte. Os polígonos com uma área inferior a este valor não serão gerados." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Tamanho mínimo da área para os pisos de suporte. Os polígonos com uma área inferior a este valor não serão gerados." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Alternar Rotação Revestimento" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterna a direção na qual as camadas superiores/inferiores são impressas. Geralmente, estas são impressas apenas na diagonal. Esta definição adiciona também as direções só em X e só em Y." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Desvio de extrusão máximo de compensação da taxa de fluxo" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "A distância máxima em milímetros a ser compensada." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Fator de compensação da taxa de fluxo" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "O fator de multiplicação da taxa de fluxo -> translação de distância." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Limiar das camadas adaptáveis" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "O limiar em que se deve usar, ou não, uma menor espessura de camada. Este número é comparado com a tangente da inclinação mais acentuada numa camada." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "As paredes que se salientam mais do que este ângulo serão impressas utilizando definições de parede de saliências. Quando o valor é 90, nenhuma parede será tratada como saliente." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Os elementos pequenos serão impressos a esta percentagem da velocidade de impressão normal. A impressão mais lenta poderá contribuir para uma maior aderência e precisão." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Velocidade da primeira camada" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Os elementos pequenos da primeira camada serão impressos a esta percentagem da velocidade de impressão normal. A impressão mais lenta poderá contribuir para uma maior aderência e precisão." + # O objetivo é derreter mais o plástico das superfícies superiores, criando uma superfície mais uniforme. #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 7c7521b1c3..ff01abfda5 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Russian , Ruslan Popov , Russian \n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 2.2.3\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Параметры принтера" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Файл G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "Средство записи G-кода (GCodeWriter) не поддерживает нетекстовый режим." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Подготовьте G-код перед экспортом." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Помощник по 3D-моделям" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Обновить прошивку" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Сбросить текущие параметры к стандартным значениям" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Профиль был нормализован и активирован." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Идет печать" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Записывает X3g в файлы" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Файл X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Файл X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Невозможно сохранить на внешний носитель {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Ошибка" @@ -243,8 +218,8 @@ msgstr "Извлекает внешний носитель {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Внимание" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Подключиться через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Печать через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Печать через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Подключен по сети" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Ошибка печати" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "GIF изображение" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Правка параметров модели" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Рекомендованная" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Своя" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Файл 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Сопло" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Файл проекта {0} содержит неизвестный тип принтера {1}. Не удалось импортировать принтер. Вместо этого будут импортированы модели." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Открыть файл проекта" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Профиль Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Помощник по профилю" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Помощник по профилю" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Предварительный просмотр" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Вход не выполнен" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Не поддерживается" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Файл уже существует" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Файл {0} уже существует. Вы уверены, что желаете перезаписать его?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Неправильный URL-адрес файла:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Настройки изменены в соответствии с текущей доступностью экструдеров:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Настройки обновлены" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Экструдер (-ы) отключен (-ы)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Неизвестно" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Невозможно экспортировать профиль в {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Невозможно экспортировать профиль в {0}: Плагин записи уведомил об ошибке." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Экспортирование профиля в {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Экспорт успешно завершен" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Не удалось импортировать профиль из {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Невозможно импортировать профиль из {0}, пока не добавлен принтер." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Отсутствует собственный профиль для импорта в файл {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Не удалось импортировать профиль из {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Данный профиль {0} содержит неверные данные, поэтому его невозможно импортировать." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Не удалось импортировать профиль из {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Успешно импортирован профиль {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "В файле {0} нет подходящих профилей." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Профиль {0} имеет неизвестный тип файла или повреждён." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Собственный профиль" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "У профайла отсутствует тип качества." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Другое" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Предообратка файла {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Следующий" @@ -962,9 +954,9 @@ msgstr "Группа #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Закрыть" @@ -979,40 +971,85 @@ msgstr "Добавить" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Отмена" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Не переопределен" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Собственные профили" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Все поддерживаемые типы ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Все файлы (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Неизвестно" +msgid "Custom Material" +msgstr "Собственный материал" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Своё" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Доступные сетевые принтеры" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Собственный материал" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Своё" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Нет связи с сервером учетных записей Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Повторить" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Отправить отчёт" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Загрузка принтеров..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Настройка сцены..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Загрузка интерфейса..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f мм" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Только один G-code файла может быть загружен в момент времени. Пропускаю импортирование {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Невозможно открыть любой другой файл, если G-code файл уже загружен. Пропускаю импортирование {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Выбранная модель слишком мала для загрузки." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Параметры принтера" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Ширина)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "мм" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Глубина)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Высота)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Форма стола" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Начало координат в центре" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Нагреваемый стол" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Подогреваемый объем печати" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Вариант G-кода" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Параметры головы" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X минимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y минимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X максимум" @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y максимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Высота портала" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Количество экструдеров" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "Стартовый G-код" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "Завершающий G-код" @@ -1477,7 +1503,7 @@ msgstr "Плагины" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Принтер" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Экструдер" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Правка" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Удалить" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Тип" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Версия прошивки" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Адрес" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Данный принтер не настроен для управления группой принтеров." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Данный принтер управляет группой из %1 принтера (-ов)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Принтер по этому адресу ещё не отвечал." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Подключить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Недействительный IP-адрес" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Введите действительный IP-адрес." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Адрес принтера" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Введите IP-адрес принтера в сети." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Завершение %1 в %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Печать" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Печать через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Печать" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Выбор принтера" @@ -2426,72 +2447,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Сглаживание" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Тип объекта" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Нормальная модель" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Печать в качестве поддержки" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Не поддерживать перекрытие с другими моделями" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Изменять настройки для перекрытия с другими моделями" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Изменять настройки для заполнения других моделей" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Выберите параметры" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Выберите параметр для изменения этой модели" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Фильтр..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Показать всё" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Тип объекта" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Нормальная модель" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Печать в качестве поддержки" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Выберите параметры" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Открытие проекта" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Обновить существующий" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Создать новый" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2516,6 +2536,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Обновить" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Создать новый" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2529,7 +2554,7 @@ msgid "Printer Group" msgstr "Группа принтеров" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Параметры профиля" @@ -2540,21 +2565,27 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Как следует решать конфликт в профиле?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Название" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Вне профиля" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2562,12 +2593,12 @@ msgstr[0] "%1 перекрыт" msgstr[1] "%1 перекрыто" msgstr[2] "%1 перекрыто" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Производное от" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" @@ -2575,42 +2606,42 @@ msgstr[0] "%1, %2 перекрыто" msgstr[1] "%1, %2 перекрыто" msgstr[2] "%1, %2 перекрыто" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Параметры материала" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Как следует решать конфликт в материале?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Видимость параметров" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Режим" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Видимые параметры:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 из %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Загрузка проекта приведет к удалению всех моделей на рабочем столе." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Открыть" @@ -2717,54 +2748,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Автоматически создавать резервную копию в день запуска Cura." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Не поддерживается" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Предыдущий" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Экспорт" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Кончик" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Универсальные" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Пробная печать" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Контрольный список" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Пожалуйста, укажите любые изменения, внесённые в Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Блок Олссона" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2850,170 +2833,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Вы уверены, что желаете прервать печать?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Информация" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Подтвердить изменение диаметра" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Установлен новый диаметр пластиковой нити %1 мм. Это значение несовместимо с текущим экструдером. Продолжить?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Отображаемое имя" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Брэнд" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Тип материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Цвет" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Свойства" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Плотность" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Диаметр" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Стоимость материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Вес материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Длина материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Стоимость метра" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Данный материал привязан к %1 и имеет ряд его свойств." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Отвязать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Описание" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Информация об адгезии" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Параметры печати" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Активировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Создать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Дублировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Импорт" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Экспорт" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Принтер" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Подтвердите удаление" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Вы уверены, что желаете удалить %1? Это нельзя будет отменить!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Импортировать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Не могу импортировать материал %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Успешно импортированный материал %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Экспортировать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Не могу экспортировать материал %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Материал успешно экспортирован в %1" @@ -3028,27 +3017,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Выбрать все" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Вычислено" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Параметр" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Текущий" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Единица" @@ -3059,307 +3048,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Общее" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Интерфейс" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Язык:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Валюта:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Тема:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Для применения данных изменений вам потребуется перезапустить приложение." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Нарезать автоматически при изменении настроек." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Нарезать автоматически" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Поведение окна" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Подсвечивать красным области модели, требующие поддержек. Без поддержек эти области не будут напечатаны правильно." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Отобразить нависания" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Перемещать камеру так, чтобы выбранная модель помещалась в центр экрана" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Центрировать камеру на выбранном объекте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Следует ли инвертировать стандартный способ увеличения в Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Инвертировать направление увеличения камеры." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Увеличивать по мере движения мышкой?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "В ортогональной проекции изменение масштаба мышью не поддерживается." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Увеличивать по движению мышки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Следует ли размещать модели на столе так, чтобы они больше не пересекались?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Удостовериться, что модели размещены рядом" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Следует ли опустить модели на стол?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Автоматически опускать модели на стол" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Показывать предупреждающее сообщение в средстве считывания G-кода." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Предупреждающее сообщение в средстве считывания G-кода" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Должен ли слой быть переведён в режим совместимости?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Просматривать слои в режиме совместимости (требуется перезапуск)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Рендеринг камеры какого типа следует использовать?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Рендеринг камеры: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Перспективная" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ортографическая" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Открытие и сохранение файлов" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Масштабировать ли модели для размещения внутри печатаемого объёма, если они не влезают в него?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Масштабировать большие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Модель может показаться очень маленькой, если её размерность задана в метрах, а не миллиметрах. Следует ли масштабировать такие модели?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Масштабировать очень маленькие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Выбрать модели после их загрузки?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Выбрать модели при загрузке" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Надо ли автоматически добавлять префикс, основанный на имени принтера, к названию задачи на печать?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Добавить префикс принтера к имени задачи" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Показывать сводку при сохранении файла проекта?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Показывать сводку при сохранении проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Стандартное поведение при открытии файла проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Стандартное поведение при открытии файла проекта: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Всегда открывать как проект" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Всегда импортировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "При внесении изменений в профиль и переключении на другой, будет показан диалог, запрашивающий ваше решение о сохранении ваших изменений, или вы можете указать стандартное поведение и не показывать такой диалог." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Поведение по умолчанию для измененных значений настройки при переключении на другой профиль: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Всегда сбрасывать измененные настройки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Всегда передавать измененные настройки новому профилю" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Приватность" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Должна ли Cura проверять обновления программы при старте?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Проверять обновления при старте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Можно ли отправлять анонимную информацию о вашей печати в Ultimaker? Следует отметить, что ни модели, ни IP-адреса и никакая другая персональная информация не будет отправлена или сохранена." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Отправлять (анонимно) информацию о печати" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Дополнительная информация" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Экспериментальное" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Использовать функционал нескольких рабочих столов" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Использовать функционал нескольких рабочих столов (требуется перезапуск)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3367,93 +3350,84 @@ msgid "Printers" msgstr "Принтеры" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Переименовать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Создать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Дублировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Создать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Укажите имя для данного профиля." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Скопировать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Переименовать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Импорт профиля" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Экспорт профиля" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Принтер: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Профили по умолчанию" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Собственные профили" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Данный профиль использует настройки принтера по умолчанию, поэтому список ниже пуст." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ваши текущие параметры совпадают с выбранным профилем." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Общие параметры" @@ -3518,35 +3492,35 @@ msgstr "Без имени" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "параметры поиска" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Скопировать значение для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Копировать все измененные значения для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Спрятать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Не показывать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Оставить этот параметр видимым" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3578,17 +3552,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Зависит от" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Данная настройка всегда используется совместно всеми экструдерами. Изменение данного значения приведет к изменению значения для всех экструдеров." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Значение получается из параметров каждого экструдера " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3599,7 +3573,7 @@ msgstr "" "\n" "Щёлкните для восстановления значения из профиля." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3610,6 +3584,14 @@ msgstr "" "\n" "Щёлкните для восстановления вычисленного значения." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3650,26 +3632,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Разрешает печать каймы или подложки. Это добавляет плоскую область вокруг или под вашим объектом, которую легко удалить после печати." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Высота слоя" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "В некоторые настройки профиля были внесены изменения. Если их необходимо изменить, перейдите в пользовательский режим." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Этот профиль качества недоступен для вашей текущей конфигурации материала и сопла. Измените эти параметры для задействования данного профиля качества." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "В настоящее время активен пользовательский профиль. Чтобы включить ползунок качества, на вкладке «Пользовательские» выберите профиль качества по умолчанию" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3680,12 +3647,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Выкл" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Экспериментальное" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Профиль" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3696,6 +3668,11 @@ msgstr "" "\n" "Нажмите для открытия менеджера профилей." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3823,11 +3800,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Материал" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Избранные" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Универсальные" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3863,16 +3845,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Отключить экструдер" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "Рабочий стол" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "Профиль" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3954,12 +3926,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Конфигурации" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Выберите конфигурации" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Конфигурации" @@ -3989,12 +3961,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Включено" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Материал" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Использовать клей для лучшего прилипания с этой комбинацией материалов." @@ -4414,44 +4386,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Параметры" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Закрытие Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Вы уверены, что хотите выйти из Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Открыть файл(ы)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Установить пакет" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Открыть файл(ы)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Среди выбранных файлов мы нашли несколько файлов с G-кодом. Вы можете открыть только один файл за раз. Измените свой выбор, пожалуйста." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Добавление принтера" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Что нового" @@ -4523,17 +4495,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "О Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "версия: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Полное решение для 3D печати методом наплавления материала." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4542,122 +4514,122 @@ msgstr "" "Cura разработана компанией Ultimaker B.V. совместно с сообществом.\n" "Cura использует следующие проекты с открытым исходным кодом:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Графический интерфейс пользователя" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Фреймворк приложения" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Генератор G-кода" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Библиотека межпроцессного взаимодействия" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Язык программирования" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Фреймворк GUI" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Фреймворк GUI, интерфейс" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ библиотека интерфейса" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Формат обмена данными" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Вспомогательная библиотека для научных вычислений" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Вспомогательная библиотека для быстрых расчётов" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Вспомогательная библиотека для работы с STL файлами" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Вспомогательная библиотека для работы с плоскими объектами" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Вспомогательная библиотека для работы с треугольными сетками" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Вспомогательная библиотека для анализа сложных сетей" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Вспомогательная библиотека для работы с 3MF файлами" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Вспомогательная библиотека для метаданных файла и потоковой передачи" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Библиотека последовательного интерфейса" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Библиотека ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Библиотека обрезки полигонов" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Библиотека Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Шрифт" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Иконки SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Развертывание приложений для различных дистрибутивов Linux" @@ -4677,32 +4649,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Сохранить проект" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Рабочий стол" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Экструдер %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 и материал" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Материал" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Больше не показывать сводку по проекту" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Сохранить" @@ -4878,12 +4845,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Поиск и устранение неисправностей" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Имя принтера" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Присвойте имя принтеру" @@ -4942,6 +4909,31 @@ msgctxt "@button" msgid "Get started" msgstr "Приступить" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5002,16 +4994,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Средство проверки моделей" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Запись содержимого всех настроек в виде HTML файла." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Режим бога" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5022,16 +5004,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Средство обновления прошивки" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Создание нормализованного профиля с изменениями качества." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Нормализатор профиля" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5232,6 +5204,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Обновление версии 3.3 до 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5432,16 +5414,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Запись профиля Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Позволяет производителям материалов создавать новые профили материалов и качества с помощью дружественного интерфейса." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Помощник по профилю печати" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5482,6 +5454,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Чтение профиля Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Сбросить текущие параметры к стандартным значениям" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Профиль был нормализован и активирован." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Записывает X3g в файлы" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Файл X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Файл X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Помощник по профилю" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Помощник по профилю" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Повторить" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Экструдер" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Не поддерживать перекрытие с другими моделями" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Изменять настройки для перекрытия с другими моделями" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Изменять настройки для заполнения других моделей" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Обновить существующий" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Не поддерживается" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Предыдущий" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Кончик" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Пробная печать" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Контрольный список" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Пожалуйста, укажите любые изменения, внесённые в Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Блок Олссона" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Рендеринг камеры: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Использовать функционал нескольких рабочих столов" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Использовать функционал нескольких рабочих столов (требуется перезапуск)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Профили по умолчанию" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "параметры поиска" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Высота слоя" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Этот профиль качества недоступен для вашей текущей конфигурации материала и сопла. Измените эти параметры для задействования данного профиля качества." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "В настоящее время активен пользовательский профиль. Чтобы включить ползунок качества, на вкладке «Пользовательские» выберите профиль качества по умолчанию" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "Рабочий стол" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "Профиль" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Рабочий стол" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Запись содержимого всех настроек в виде HTML файла." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Режим бога" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Создание нормализованного профиля с изменениями качества." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Нормализатор профиля" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Позволяет производителям материалов создавать новые профили материалов и качества с помощью дружественного интерфейса." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Помощник по профилю печати" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Подключен по сети." diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index 3fa794c4b4..e673a97245 100644 --- a/resources/i18n/ru_RU/fdmextruder.def.json.po +++ b/resources/i18n/ru_RU/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index cc7cf8f5f9..9d12ed2524 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Russian , Ruslan Popov , Russian \n" @@ -1031,6 +1031,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Количество слоёв в дне. При вычислении толщины дна это значение округляется до целого." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1424,8 +1434,7 @@ msgstr "Разрешить разглаживание" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Проходить по верхней оболочке еще раз, но на этот раз выдавливая очень мало материала. Это приводит к плавлению пластика, что создает более гладкую поверхность." -" Давление в камере сопла поддерживается на высоком уровне, благодаря чему складки на поверхности заполняются материалом." +msgstr "Проходить по верхней оболочке еще раз, но на этот раз выдавливая очень мало материала. Это приводит к плавлению пластика, что создает более гладкую поверхность. Давление в камере сопла поддерживается на высоком уровне, благодаря чему складки на поверхности заполняются материалом." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1710,8 +1719,7 @@ msgstr "Рандомизация начала заполнения" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "Рандомизировать, какая линия заполнения печатается первой. Это препятствует тому, чтобы один сегмент стал самым сильным, но делает это за счет дополнительного" -" перемещения." +msgstr "Рандомизировать, какая линия заполнения печатается первой. Это препятствует тому, чтобы один сегмент стал самым сильным, но делает это за счет дополнительного перемещения." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -3570,9 +3578,7 @@ msgstr "Направление линии заполнения поддерже #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется" -" сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартного" -" угла 0 градусов." +msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартного угла 0 градусов." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3986,8 +3992,8 @@ msgstr "Минимальная зона связующего слоя" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Минимальная площадь зоны для полигонов связующего слоя. Полигоны с площадью меньше данного значения не будут генерироваться." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3996,8 +4002,8 @@ msgstr "Минимальная зона верхней части поддерж #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Минимальная площадь зоны для верхних частей поддержек. Полигоны с площадью меньше данного значения не будут генерироваться." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4006,8 +4012,8 @@ msgstr "Минимальная зона нижней части поддерже #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Минимальная площадь зоны для нижних частей поддержек. Полигоны с площадью меньше данного значения не будут генерироваться." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4047,9 +4053,7 @@ msgstr "Направления линии связующего слоя подд #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется" -" сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных" -" углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." +msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4059,9 +4063,7 @@ msgstr "Направления линии крыши поддержек" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется" -" сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных" -" углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." +msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4071,9 +4073,7 @@ msgstr "Направления линии низа поддержек" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется" -" сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных" -" углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." +msgstr "Список целочисленных направлений линии. Элементы списка используются последовательно по мере печати слоев, и, когда конец списка будет достигнут, он начнется сначала. Элементы списка отделяются запятыми, и сам список заключен в квадратные скобки. По умолчанию список пустой, что означает использование стандартных углов (45 либо 135 градусов, если связующий слой довольно толстый, или 90 градусов)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4799,6 +4799,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Удаление пустых слоёв под первым печатаемым слоем, если они имеются. Отключение этой функции может привести к созданию первых пустых слоев, если для параметра «Допуск слайсинга» установлено значение «Включение» или «Середина»." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Максимальное разрешение" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Минимальный размер сегмента линии после слайсинга. Увеличение значения этого параметра понизит разрешение модели. Это может позволить принтеру поддерживать скорость обработки кода G и увеличит скорость слайсинга за счет удаления деталей модели, которые он в любом случае не сможет обработать." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Максимальное разрешение перемещения" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Минимальный размер сегмента линии перемещения после разделения на слои. При увеличении этого значения углы при перемещении будут менее сглаженными. Это может помочь принтеру поддерживать скорость обработки G-кода, однако при этом может снизиться точность избегания моделей." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Максимальное отклонение" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "Максимальное допустимое отклонение при снижении разрешения для параметра максимального разрешения. Увеличение этого значения понизит точность печати и уменьшит значение G-кода. Максимальное отклонение является пределом для максимального разрешения, поэтому, если они конфликтуют, истинным считается максимальное отклонение." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5174,38 +5204,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Полигоны в разделенных слоях, длина окружности которых меньше указанной величины, будут отфильтрованы. Пониженные значения приводят к увеличению разрешения объекта за счет времени разделения. Это предназначено главным образом для принтеров SLA с высоким разрешением и миниатюрных 3D-моделей с множеством деталей." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Максимальное разрешение" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Минимальный размер сегмента линии после слайсинга. Увеличение значения этого параметра понизит разрешение модели. Это может позволить принтеру поддерживать скорость обработки кода G и увеличит скорость слайсинга за счет удаления деталей модели, которые он в любом случае не сможет обработать." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Максимальное разрешение перемещения" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Минимальный размер сегмента линии перемещения после разделения на слои. При увеличении этого значения углы при перемещении будут менее сглаженными. Это может помочь принтеру поддерживать скорость обработки G-кода, однако при этом может снизиться точность избегания моделей." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Максимальное отклонение" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "Максимальное допустимое отклонение при снижении разрешения для параметра максимального разрешения. Увеличение этого значения понизит точность печати и" -" уменьшит значение G-кода. Максимальное отклонение является пределом для максимального разрешения, поэтому, если они конфликтуют, истинным считается максимальное" -" отклонение." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5346,16 +5344,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Скорость, с которой производятся движения во время наката, относительно скорости печати. Рекомендуется использовать значение чуть меньше 100%, так как во время наката давление в боудене снижается." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Чередование вращения оболочек" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Изменить направление, в котором печатаются слои крышки/дна. Обычно, они печатаются по диагонали. Данный параметр добавляет направления X-только и Y-только." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5528,23 +5516,23 @@ msgstr "Среднее расстояние между случайными то #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Макс. смещение экструзии для компенсации расхода" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Максимальное компенсируемое расстояние в миллиметрах." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Коэффициент компенсации расхода" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Коэффициент перевода расхода в расстояние." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5837,13 +5825,13 @@ msgstr "Разница между высотой следующего слоя #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Порог для адаптивных слоев" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Пороговое значение, при достижении которого будет использоваться меньший слой. Это число сравнивается с тангенсом наиболее крутого наклона в слое." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5852,8 +5840,8 @@ msgstr "Угол нависающей стенки" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Стенки, нависающие под углом, который больше указанного, будут напечатаны с использованием настроек нависающей стенки. Если значение составляет 90, стенки не считаются нависающими." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6232,20 +6220,18 @@ msgstr "Скорость для малых элементов" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Малые элементы будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить адгезию" -" и точность." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Скорость первого слоя" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Малые элементы на первом слое будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить" -" адгезию и точность." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6307,6 +6293,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Матрица преобразования, применяемая к модели при её загрузке из файла." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Минимальная площадь зоны для полигонов связующего слоя. Полигоны с площадью меньше данного значения не будут генерироваться." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Минимальная площадь зоны для верхних частей поддержек. Полигоны с площадью меньше данного значения не будут генерироваться." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Минимальная площадь зоны для нижних частей поддержек. Полигоны с площадью меньше данного значения не будут генерироваться." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Чередование вращения оболочек" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Изменить направление, в котором печатаются слои крышки/дна. Обычно, они печатаются по диагонали. Данный параметр добавляет направления X-только и Y-только." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Макс. смещение экструзии для компенсации расхода" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Максимальное компенсируемое расстояние в миллиметрах." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Коэффициент компенсации расхода" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Коэффициент перевода расхода в расстояние." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Порог для адаптивных слоев" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Пороговое значение, при достижении которого будет использоваться меньший слой. Это число сравнивается с тангенсом наиболее крутого наклона в слое." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Стенки, нависающие под углом, который больше указанного, будут напечатаны с использованием настроек нависающей стенки. Если значение составляет 90, стенки не считаются нависающими." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Малые элементы будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить адгезию и точность." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Скорость первого слоя" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Малые элементы на первом слое будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить адгезию и точность." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Проходить по верхней оболочке ещё раз, но без выдавливания материала. Это приводит к плавлению пластика, что создаёт более гладкую поверхность." diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 51be61add2..018b59e7aa 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Turkish , Turkish \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Makine Ayarları" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code dosyası" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter metin dışı modu desteklemez." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Lütfen dışa aktarmadan önce G-code'u hazırlayın." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3D Model Yardımcısı" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Aygıt Yazılımını Güncelle" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Düzleştirme aktif ayarları" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "Profil düzleştirilmiş ve aktifleştirilmiştir." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Baskı Sürüyor" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Dosyalara X3g yazar" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g Dosyası" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G Dosyası" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Çıkarılabilir aygıta {0} kaydedilemedi: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Hata" @@ -243,8 +218,8 @@ msgstr "Çıkarılabilir aygıtı çıkar {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Uyarı" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ağ ile Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Ağ üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Ağ üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Ağ üzerinden bağlandı" @@ -301,12 +276,26 @@ msgctxt "@info:title" msgid "Print error" msgstr "Baskı hatası" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" msgid "You are attempting to connect to {0} but it is not the host of a group. You can visit the web page to configure it as a group host." -msgstr "{0} ile bağlantı kurmayı deniyorsunuz ancak cihaz bir grubun ana makinesi değil. Bu cihazı grup ana makinesi olarak yapılandırmak için web sayfasını ziyaret" -" edebilirsiniz." +msgstr "{0} ile bağlantı kurmayı deniyorsunuz ancak cihaz bir grubun ana makinesi değil. Bu cihazı grup ana makinesi olarak yapılandırmak için web sayfasını ziyaret edebilirsiniz." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:30 msgctxt "@info:title" @@ -502,9 +491,9 @@ msgid "GIF Image" msgstr "GIF Resmi" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -595,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Model Başına Ayarları Yapılandır" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Önerilen Ayarlar" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Özel" @@ -611,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF Dosyası" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Nozül" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Proje dosyası {0} bilinmeyen bir makine tipi içeriyor: {1}. Makine alınamıyor. Bunun yerine modeller alınacak." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Proje Dosyası Aç" @@ -703,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura Profili" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profil Asistanı" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profil Asistanı" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -733,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Önizleme" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -749,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Giriş başarısız" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Desteklenmiyor" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "Dosya Zaten Mevcut" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Dosya {0} zaten mevcut. Üstüne yazmak istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Geçersiz dosya URL’si:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Ayarlar, ekstrüderlerin mevcut kullanılabilirliğine uyacak şekilde değiştirildi:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Ayarlar güncellendi" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstrüder(ler) Devre Dışı Bırakıldı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Bilinmiyor" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Profilin {0} dosyasına aktarımı başarısız oldu: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Profilin {0} dosyasına aktarımı başarısız oldu: Yazıcı eklentisinde rapor edilen hata." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil {0} dosyasına aktarıldı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Dışa aktarma başarılı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Yazıcı eklenmeden önce profil, {0} dosyasından içe aktarılamaz." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "{0} dosyasında içe aktarılabilecek özel profil yok" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Bu {0} profili yanlış veri içeriyor, içeri aktarılamadı." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil başarıyla içe aktarıldı {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Dosya {0} geçerli bir profil içermemekte." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} öğesinde bilinmeyen bir dosya türü var veya profil bozuk." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Özel profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilde eksik bir kalite tipi var." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -942,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Diğer" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Önceden dilimlenmiş dosya {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Sonraki" @@ -963,9 +954,9 @@ msgstr "Grup #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Kapat" @@ -980,40 +971,85 @@ msgstr "Ekle" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "İptal Et" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Geçersiz kılınmadı" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Özel profiller" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Tüm desteklenen türler ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tüm Dosyalar (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Bilinmiyor" +msgid "Custom Material" +msgstr "Özel Malzeme" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Özel" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1025,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Mevcut ağ yazıcıları" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Özel Malzeme" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Özel" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1071,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker hesabı sunucusuna ulaşılamadı." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Yeniden dene" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1260,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapor gönder" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Makineler yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Görünüm ayarlanıyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Arayüz yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Aynı anda yalnızca bir G-code dosyası yüklenebilir. {0} içe aktarma atlandı" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-code yüklenirken başka bir dosya açılamaz. {0} içe aktarma atlandı" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Seçilen model yüklenemeyecek kadar küçüktü." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Yazıcı Ayarları" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (Genişlik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1324,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Derinlik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Yükseklik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Yapı levhası şekli" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Merkez nokta" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Isıtılmış yatak" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Isıtılmış yapı hacmi" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "G-code türü" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Yazıcı Başlığı Ayarları" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X maks" @@ -1384,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y maks" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Portal Yüksekliği" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Ekstrüder Sayısı" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code’u Başlat" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-code’u Sonlandır" @@ -1478,7 +1503,7 @@ msgstr "Eklentiler" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1673,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Makine" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Baskı Hücresi" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1933,9 +1953,9 @@ msgid "Edit" msgstr "Düzenle" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Kaldır" @@ -1956,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Tür" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Üretici yazılımı sürümü" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Bu yazıcı, bir yazıcı grubunu barındırmak için ayarlı değildir." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Bu yazıcı, %1 yazıcı grubunun ana makinesidir." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Bu adresteki yazıcı henüz yanıt vermedi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Geçersiz IP adresi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Lütfen geçerli bir IP adresi girin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Yazıcı Adresi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Ağdaki yazıcınızın IP adresini girin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2065,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%1 bitiş tarihi: %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Yazdır" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Ağ üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Yazdır" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Yazıcı seçimi" @@ -2426,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Düzeltme" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Ağ Tipi" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Normal model" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Destek olarak yazdır" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Diğer modellerle örtüşmeyi destekleme" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Diğer modellerle örtüşme ayarlarını değiştir" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Diğer modellerle doldurma ayarlarını değiştir" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Ayarları seçin" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Bu modeli Özelleştirmek için Ayarları seçin" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrele..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Tümünü göster" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Ağ Tipi" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Normal model" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Destek olarak yazdır" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Ayarları seçin" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Proje Aç" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Var olanları güncelleştir" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Yeni oluştur" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2516,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Güncelle" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Yeni oluştur" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2529,7 +2553,7 @@ msgid "Printer Group" msgstr "Yazıcı Grubu" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profil ayarları" @@ -2540,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Profildeki çakışma nasıl çözülmelidir?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "İsim" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Profilde değil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 geçersiz kılma" msgstr[1] "%1 geçersiz kılmalar" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Kaynağı" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 geçersiz kılma" msgstr[1] "%1, %2 geçersiz kılmalar" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Malzeme ayarları" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Malzemedeki çakışma nasıl çözülmelidir?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Görünürlük ayarı" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Mod" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Görünür ayarlar:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Bir projenin yüklenmesi derleme levhasındaki tüm modelleri siler." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Aç" @@ -2715,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Cura’nın başlatıldığı günlerde otomatik olarak yedekleme yapar." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Desteklenmiyor" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Önceki" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Dışa Aktar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "İpucu" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genel" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Yazdırma denemesi" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Kontrol listesi" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Ultimaker 2 için yapılan herhangi bir yükseltmeyi seçiniz." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Bloku" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2848,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Yazdırmayı iptal etmek istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Bilgi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Çap Değişikliğini Onayla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Yeni filaman çapı %1 mm olarak ayarlandı ve bu değer, geçerli ekstrüder ile uyumlu değil. Devam etmek istiyor musunuz?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Görünen Ad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Malzeme Türü" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Renk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Özellikler" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Yoğunluk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Çap" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Filaman masrafı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Filaman ağırlığı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Filaman uzunluğu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Metre başına maliyet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Bu malzeme %1’e bağlıdır ve özelliklerinden bazılarını paylaşır." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Malzemeyi Ayır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Tanım" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Yapışma Bilgileri" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Yazdırma ayarları" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Etkinleştir" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Dışa Aktar" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Yazıcı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Kaldırmayı Onayla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1’i kaldırmak istediğinizden emin misiniz? Bu eylem geri alınamaz!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Malzemeyi İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Malzeme %1 dosyasına içe aktarılamadı: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Malzeme %1 dosyasına başarıyla içe aktarıldı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Malzemeyi Dışa Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Malzemenin %1 dosyasına dışa aktarımı başarısız oldu: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Malzeme %1 dosyasına başarıyla dışa aktarıldı" @@ -3026,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Tümünü denetle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Hesaplanmış" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Ayar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Geçerli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Birim" @@ -3057,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Genel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Arayüz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Dil:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Para Birimi:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Bu değişikliklerinin geçerli olması için uygulamayı yeniden başlatmanız gerekecektir." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Ayarlar değiştirilirken otomatik olarak dilimle." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Otomatik olarak dilimle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Görünüm şekli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Modelin desteklenmeyen alanlarını kırmızı ile gösterin. Destek alınmadan bu alanlar düzgün bir şekilde yazdırılmayacaktır." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Dışarıda kalan alanı göster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bir model seçildiğinde bu model görüntünün ortasında kalacak şekilde kamera hareket eder" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Öğeyi seçince kamerayı ortalayın" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Cura’nın varsayılan yakınlaştırma davranışı tersine çevrilsin mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kamera yakınlaştırma yönünü ters çevir." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Yakınlaştırma farenin hareket yönüne uygun olsun mu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Fareye doğru yakınlaştırma yapılması ortografik perspektifte desteklenmez." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Farenin hareket yönüne göre yakınlaştır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Platformun üzerindeki öğeler kesişmemeleri için hareket ettirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellerin birbirinden ayrı olduğundan emin olduğundan emin olun" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Platformun üzerindeki modeller yapı levhasına değmeleri için indirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modelleri otomatik olarak yapı tahtasına indirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-code okuyucuda uyarı mesajı göster." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code okuyucuda uyarı mesajı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Katman, uyumluluk moduna zorlansın mı?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Katman görünümünü uyumluluk moduna zorla (yeniden başlatma gerekir)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Ne tür bir kamera oluşturma işlemi kullanılmalıdır?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "Kamera oluşturma: " +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspektif" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortografik" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Dosyaların açılması ve kaydedilmesi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Modeller çok büyükse yapı hacmine göre ölçeklendirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Büyük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Bir modelin birimi milimetre değil de metre ise oldukça küçük görünebilir. Bu modeller ölçeklendirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Çok küçük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Yüklendikten sonra modeller seçilsin mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Yüklendiğinde modelleri seç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Yazıcı adına bağlı bir ön ek otomatik olarak yazdırma işinin adına eklenmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Makine ön ekini iş adına ekleyin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Bir proje dosyasını kaydederken özet gösterilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Projeyi kaydederken özet iletişim kutusunu göster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Bir proje dosyası açıldığında varsayılan davranış" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Bir proje dosyası açıldığında varsayılan davranış: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Her zaman proje olarak aç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Her zaman modelleri içe aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Bir profil üzerinde değişiklik yapıp farklı bir profile geçtiğinizde, değişikliklerin kaydedilmesini isteyip istemediğinizi soran bir iletişim kutusu açılır. Alternatif olarak bu işleve yönelik varsayılan bir davranış seçebilir ve bu iletişim kutusunun bir daha görüntülenmemesini tercih edebilirsiniz." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Farklı bir profile geçerken değişen ayar değerleriyle ilgili varsayılan davranış: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Değiştirilen ayarları her zaman at" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Değiştirilen ayarları her zaman yeni profile taşı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Gizlilik" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura, program başladığında güncellemeleri kontrol etmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Başlangıçta güncellemeleri kontrol edin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Yazdırmanızdaki anonim veriler Ultimaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonim) yazdırma bilgisi gönder" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Daha fazla bilgi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Deneysel" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Çok yapılı levha fonksiyonelliğini kullan" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Çok yapılı levha fonksiyonelliğini kullan (yeniden başlatma gerektirir)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3365,93 +3347,84 @@ msgid "Printers" msgstr "Yazıcılar" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Yeniden adlandır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Profil Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Bu profil için lütfen bir ad girin." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profili Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profili Yeniden Adlandır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Profili İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Profili Dışa Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Yazıcı: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Varsayılan profiller" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Özel profiller" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profili geçerli ayarlar/geçersiz kılmalar ile güncelle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Geçerli değişiklikleri iptal et" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Bu profil yazıcının belirlediği varsayılan ayarları kullanır; dolayısıyla aşağıdaki listede bulunan ayarları/geçersiz kılmaları içermez." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Geçerli ayarlarınız seçilen profille uyumlu." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Küresel Ayarlar" @@ -3516,35 +3489,35 @@ msgstr "Başlıksız" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "arama ayarları" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Değeri tüm ekstruderlere kopyala" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Tüm değiştirilmiş değerleri tüm ekstruderlere kopyala" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Bu ayarı gizle" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Bu ayarı gösterme" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Bu ayarı görünür yap" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3576,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr ".........den etkilenir" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Bu ayar her zaman, tüm ekstrüderler arasında paylaşılır. Buradan değiştirildiğinde tüm ekstrüderler için değer değiştirir." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Değer, her bir ekstruder değerinden alınır. " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3597,7 +3570,7 @@ msgstr "" "\n" "Profil değerini yenilemek için tıklayın." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3608,6 +3581,13 @@ msgstr "" "\n" "Hesaplanan değeri yenilemek için tıklayın." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" +msgstr[1] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3648,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Bir kenar veya radye yazdırın. Bu nesnenizin etrafına veya altına daha sonra kesilmesi kolay olan düz bir alan sağlayacak." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Katman Yüksekliği" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Bazı profil ayarlarını değiştirdiniz. Bunları değişiklikleri kaydetmek istiyorsanız, özel moda gidin." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Bu kalite profili mevcut malzemeniz ve nozül yapılandırması için kullanılamaz. Bu kalite profilini etkinleştirmek için lütfen bu öğeleri değiştirin." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Özel bir profil şu anda aktif. Kalite kaydırıcısını etkinleştirmek için Özel sekmesinde varsayılan bir kalite seçin" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3678,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Kapalı" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Deneysel" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Profil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3694,6 +3664,11 @@ msgstr "" "\n" "Profil yöneticisini açmak için tıklayın." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3821,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoriler" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genel" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3861,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Ekstruderi Devre Dışı Bırak" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "&Yapı levhası" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Profil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3950,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Yapılandırmalar" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Yapılandırma seç" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Yapılandırmalar" @@ -3985,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Etkin" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Bu malzeme kombinasyonuyla daha iyi yapıştırma için yapıştırıcı kullanın." @@ -4407,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ayarlar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura Kapatılıyor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura’dan çıkmak istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Dosya aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Paketi Kur" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Dosya Aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Seçtiğiniz dosyalar arasında bir veya daha fazla G-code dosyası bulduk. Tek seferde sadece bir G-code dosyası açabilirsiniz. Bir G-code dosyası açmak istiyorsanız, sadece birini seçiniz." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Yazıcı Ekle" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Yenilikler" @@ -4515,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Cura hakkında" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "sürüm: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kaynaşık filaman 3B yazdırma için kalıcı çözüm." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4534,122 +4504,122 @@ msgstr "" "Cura, topluluk iş birliği ile Ultimaker B.V. tarafından geliştirilmiştir.\n" "Cura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafik kullanıcı arayüzü" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Uygulama çerçevesi" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-code oluşturucu" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "İşlemler arası iletişim kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Programlama dili" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI çerçevesi" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI çerçeve bağlantıları" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ Bağlantı kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Veri değişim biçimi" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Bilimsel bilgi işlem için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Daha hızlı matematik için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL dosyalarının işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Düzlemsel nesnelerin işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Üçgen birleşimlerin işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Karmaşık ağların analizi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MF dosyalarının işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Dosya meta verileri ve akış için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Seri iletişim kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf keşif kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Poligon kırpma kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Yazı tipi" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG simgeleri" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux çapraz-dağıtım uygulama dağıtımı" @@ -4669,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projeyi Kaydet" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Baskı tepsisi" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Ekstruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Kaydederken proje özetini bir daha gösterme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Kaydet" @@ -4870,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Sorun giderme" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Yazıcı adı" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Lütfen yazıcınıza bir isim verin" @@ -4934,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Başlayın" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4994,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Model Kontrol Edici" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Tüm ayarların içeriklerini bir HTML dosyasına aktarır." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Tanrı Modu" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5014,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Aygıt Yazılımı Güncelleyici" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Düzleştirilmiş kalitede değiştirilmiş bir profil oluşturun." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Profil Düzleştirici" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5224,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "3.3'dan 3.4'e Sürüm Yükseltme" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5424,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profili Yazıcı" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Malzeme üreticilerine bir drop-in UI kullanarak yeni malzeme ve kalite profili oluşturma imkanı sunar." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Baskı Profili Asistanı" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5474,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura Profil Okuyucu" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Düzleştirme aktif ayarları" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "Profil düzleştirilmiş ve aktifleştirilmiştir." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Dosyalara X3g yazar" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g Dosyası" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G Dosyası" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profil Asistanı" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profil Asistanı" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Yeniden dene" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Baskı Hücresi" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Diğer modellerle örtüşmeyi destekleme" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Diğer modellerle örtüşme ayarlarını değiştir" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Diğer modellerle doldurma ayarlarını değiştir" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Var olanları güncelleştir" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Desteklenmiyor" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Önceki" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "İpucu" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Yazdırma denemesi" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Kontrol listesi" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Ultimaker 2 için yapılan herhangi bir yükseltmeyi seçiniz." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Bloku" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Kamera oluşturma: " + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Çok yapılı levha fonksiyonelliğini kullan" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Çok yapılı levha fonksiyonelliğini kullan (yeniden başlatma gerektirir)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Varsayılan profiller" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "arama ayarları" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Katman Yüksekliği" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Bu kalite profili mevcut malzemeniz ve nozül yapılandırması için kullanılamaz. Bu kalite profilini etkinleştirmek için lütfen bu öğeleri değiştirin." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Özel bir profil şu anda aktif. Kalite kaydırıcısını etkinleştirmek için Özel sekmesinde varsayılan bir kalite seçin" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "&Yapı levhası" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Profil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Baskı tepsisi" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Tüm ayarların içeriklerini bir HTML dosyasına aktarır." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Tanrı Modu" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Düzleştirilmiş kalitede değiştirilmiş bir profil oluşturun." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Profil Düzleştirici" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Malzeme üreticilerine bir drop-in UI kullanarak yeni malzeme ve kalite profili oluşturma imkanı sunar." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Baskı Profili Asistanı" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Ağ üzerinden bağlandı." diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index b5c615bc1f..b7152c5d85 100644 --- a/resources/i18n/tr_TR/fdmextruder.def.json.po +++ b/resources/i18n/tr_TR/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 2cfa52a184..5541a3b254 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" "Language-Team: Turkish , Turkish \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "Alt katman sayısı. Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -1423,8 +1433,7 @@ msgstr "Ütülemeyi Etkinleştir" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "Üst yüzey üzerinden bir kere daha geçilir, ancak bu defa çok küçük malzeme ekstrüde edilir. Bu işlem en üstte bulunan plastiği eriterek daha pürüzsüz bir" -" yüzey oluşturur. Nozül haznesindeki baskı yüksek tutularak yüzeydeki kıvrımların malzemeyle dolması sağlanır." +msgstr "Üst yüzey üzerinden bir kere daha geçilir, ancak bu defa çok küçük malzeme ekstrüde edilir. Bu işlem en üstte bulunan plastiği eriterek daha pürüzsüz bir yüzey oluşturur. Nozül haznesindeki baskı yüksek tutularak yüzeydeki kıvrımların malzemeyle dolması sağlanır." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1709,8 +1718,7 @@ msgstr "Rastgele Boşluk Doldurma Başlat" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "Önce hangi boşluk doldurma hattının yapılacağını rastgele belirler. Böylece tek bir segmentin en güçlü yapıda olması önlenir ancak bu işlem ilave gezinti" -" hamlelerine neden olabilir." +msgstr "Önce hangi boşluk doldurma hattının yapılacağını rastgele belirler. Böylece tek bir segmentin en güçlü yapıda olması önlenir ancak bu işlem ilave gezinti hamlelerine neden olabilir." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -3569,8 +3577,7 @@ msgstr "Destek Dolgu Hattı Yönü" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır." -" Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar listenin boş olmasıdır ve bu durumda varsayılan açı 0'dır." +msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır. Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar listenin boş olmasıdır ve bu durumda varsayılan açı 0'dır." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3984,8 +3991,8 @@ msgstr "Minimum Destek Arayüzü Bölgesi" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Destek arayüzü poligonları için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3994,8 +4001,8 @@ msgstr "Minimum Destek Çatısı Bölgesi" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Destek çatıları için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4004,8 +4011,8 @@ msgstr "Minimum Destek Zemini Bölgesi" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Destek zeminleri için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4045,9 +4052,7 @@ msgstr "Destek Arabirim Hattı Yönleri" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır." -" Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa" -" 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." +msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır. Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." #: fdmprinter.def.json msgctxt "support_roof_angles label" @@ -4057,9 +4062,7 @@ msgstr "Destek Çatı Hattı Yönleri" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır." -" Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa" -" 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." +msgstr "Kullanılacak tam hat yönlerinin listesi. Katmanlar ilerledikçe listedeki öğeler sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır. Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." #: fdmprinter.def.json msgctxt "support_bottom_angles label" @@ -4069,9 +4072,7 @@ msgstr "Destek Zemin Hattı Yönleri" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "Kullanılacak tam hat yönlerinin listesi. Listedeki öğeler katmanlar ilerledikçe sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır." -" Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa" -" 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." +msgstr "Kullanılacak tam hat yönlerinin listesi. Listedeki öğeler katmanlar ilerledikçe sırayla kullanılır ve listenin sonuna gelindiğinde tekrar baştan başlanır. Liste öğeleri virgülle ayrılır ve listenin tamamı köşeli paranteze alınır. Varsayılan ayar, varsayılan açıların kullanıldığı (ara birimler biraz kalınsa 45 ile 135 derece arasında değişir veya 90 derecedir) boş listedir." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4797,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Basılan ilk katmanın altındaki varsa boş katmanları kaldır. Bu ayarın devre dışı bırakılması, Dilimleme Toleransı Dışlayıcı veya Ortalayıcı olarak ayarlanmışsa, boş ilk katmanlar oluşmasına neden olabilir." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Maksimum Çözünürlük" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "Bir çizginin dilimlemeden sonraki minimum boyutu. Bu değer artırıldıktan sonra örgünün çözünürlüğü düşer. Bu, yazıcının g-kodunu işlemek için gereken hıza yetişmesine olanak tanır ve örtünün zaten işlenemeyecek ayrıntılarını kaldırarak dilimleme hızını artırır." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Maksimum Hareket Çözünürlüğü" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "Bir hareket çizgisinin dilimlemeden sonraki minimum boyutu. Bunu artırmanız durumunda, hareketlerde köşelerin yumuşaklığı azalır. Bu seçenek, yazıcının g-code işlemek için gereken hızı yakalamasına olanak tanıyabilir ancak model kaçınmasının doğruluğunu azaltabilir." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Maksimum Sapma" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "Maksimum Çözünürlük ayarı için çözünürlük azaltıldığında izin verilen maksimum sapma. Bu değeri artırırsanız baskının doğruluğu azalacak ancak g kodu daha küçük olacaktır. Maksimum Sapma, Maksimum Çözünürlük için sınırdır, dolayısıyla iki değer çelişirse Maksimum Sapma her zaman doğru kabul edilir." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5172,37 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Bu miktardan daha kısa çevre uzunluğuna sahip dilimlenmiş katmanlardaki poligonlar filtre ile elenecektir. Daha düşük değerler dilimleme süresini uzatacak ancak daha yüksek çözünürlükte bir ağ oluşturacaktır. Genellikle yüksek çözünürlüklü SLA yazıcılarına yöneliktir ve çok fazla detay içeren çok küçük 3D modellerinde kullanılır." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Maksimum Çözünürlük" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "Bir çizginin dilimlemeden sonraki minimum boyutu. Bu değer artırıldıktan sonra örgünün çözünürlüğü düşer. Bu, yazıcının g-kodunu işlemek için gereken hıza yetişmesine olanak tanır ve örtünün zaten işlenemeyecek ayrıntılarını kaldırarak dilimleme hızını artırır." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Maksimum Hareket Çözünürlüğü" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "Bir hareket çizgisinin dilimlemeden sonraki minimum boyutu. Bunu artırmanız durumunda, hareketlerde köşelerin yumuşaklığı azalır. Bu seçenek, yazıcının g-code işlemek için gereken hızı yakalamasına olanak tanıyabilir ancak model kaçınmasının doğruluğunu azaltabilir." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Maksimum Sapma" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "Maksimum Çözünürlük ayarı için çözünürlük azaltıldığında izin verilen maksimum sapma. Bu değeri artırırsanız baskının doğruluğu azalacak ancak g kodu daha" -" küçük olacaktır. Maksimum Sapma, Maksimum Çözünürlük için sınırdır, dolayısıyla iki değer çelişirse Maksimum Sapma her zaman doğru kabul edilir." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5343,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "Ekstrüzyon yolu hızına göre tarama sırasındaki hareket hızı. Tarama hareketi sırasında bowden tüpündeki basınç düştüğü için değerin %100’ün altında olması öneriliyor." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Dış Katman Rotasyonunu Değiştir" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Üst/alt katmanların yazdırıldığı yönü değiştirin. Normal koşullarda sadece çapraz şekilde yazdırılırlar. Bu ayar sadece-X ve sadece-Y yönlerini ekler." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5525,23 +5515,23 @@ msgstr "Her bir hat dilimine tanıtılan rastgele noktalar arasındaki ortalama #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Akış hızı dengelemesi maksimum ekstrüzyon kayması" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "Dengelenecek, mm cinsinden maksimum mesafe." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Akış hızı dengeleme çarpanı" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "Akış hızından -> mesafeye dönüştürme için çarpan." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5834,13 +5824,13 @@ msgstr "Bir önceki ve bir sonraki katman yüksekliği arasındaki yükseklik fa #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Uyarlanabilir Katman Eşiği" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Daha küçük bir katmanın kullanılıp kullanılmayacağını belirleyen eşik. Bu rakam bir katmandaki en dik eğimin tanjantına eşittir." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5849,8 +5839,8 @@ msgstr "Çıkıntılı Duvar Açısı" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlar çıkıntılı duvar ayarları kullanılarak yazdırılacaktır. Değer 90 ise hiçbir duvar çıkıntılı kabul edilmeyecektir." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6229,18 +6219,18 @@ msgstr "Küçük Özellik Hızı" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "İlk Katman Hızı" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "İlk katman üzerindeki küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6302,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Destek arayüzü poligonları için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Destek çatıları için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Destek zeminleri için minimum alan boyutu. Alanı bu değerden daha düşük olan poligonlar oluşturulmayacaktır." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Dış Katman Rotasyonunu Değiştir" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Üst/alt katmanların yazdırıldığı yönü değiştirin. Normal koşullarda sadece çapraz şekilde yazdırılırlar. Bu ayar sadece-X ve sadece-Y yönlerini ekler." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Akış hızı dengelemesi maksimum ekstrüzyon kayması" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "Dengelenecek, mm cinsinden maksimum mesafe." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Akış hızı dengeleme çarpanı" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "Akış hızından -> mesafeye dönüştürme için çarpan." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Uyarlanabilir Katman Eşiği" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Daha küçük bir katmanın kullanılıp kullanılmayacağını belirleyen eşik. Bu rakam bir katmandaki en dik eğimin tanjantına eşittir." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlar çıkıntılı duvar ayarları kullanılarak yazdırılacaktır. Değer 90 ise hiçbir duvar çıkıntılı kabul edilmeyecektir." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "İlk Katman Hızı" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "İlk katman üzerindeki küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Malzeme ekstrude edilmeden önce üst yüzey üzerinden bir kere daha geçilir. Bu işlem en üstte bulunan plastiği eriterek daha pürüzsüz bir yüzey elde etmek için kullanılır." diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index b38b38fde6..5e71b6f06e 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index 2e104ef9bb..8a1a46fb7c 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 1c2d9c688f..135d086d5c 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -2,7 +2,7 @@ # Copyright (C) 2019 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2019. -# +# msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 4987400320..d127885fda 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-19 23:41+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "印表機設定" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code 檔案" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "G-code 寫入器不支援非文字模式。" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "匯出前請先將 G-code 準備好。" @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "3D 模型助手" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "更新韌體" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "合併有效設定" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "列印參數已被合併並啟用。" - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "列印正在進行中" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "將 X3g 寫入檔案" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "X3g 檔案" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 檔案" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "無法儲存到行動裝置 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "錯誤" @@ -243,8 +218,8 @@ msgstr "卸載行動裝置 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "透過網路連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "網路連線列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "網路連線列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "透過網路連接" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "列印錯誤" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -502,9 +492,9 @@ msgid "GIF Image" msgstr "GIF 圖片" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -595,12 +585,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "設定對每個模型的單獨設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "推薦" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "自訂選項" @@ -611,19 +601,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 檔案" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "噴頭" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "專案檔案 {0} 包含未知的機器類型 {1}。機器無法被匯入，但模型將被匯入。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "開啟專案檔案" @@ -703,16 +693,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 列印參數" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "參數助手" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "參數助手" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -733,7 +713,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "預覽" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -749,134 +728,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "登入失敗" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "不支援" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "檔案已經存在" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "檔案 {0} 已存在。你確定要覆蓋掉它嗎?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無效的檔案網址：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "設定已被更改為符合目前擠出機：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "設定更新" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "擠出機已停用" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "未知" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "無法將列印參數匯出至 {0}：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "無法將列印參數匯出至 {0}：寫入器外掛報告故障。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "列印參數已匯出至：{0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "匯出成功" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "無法從 {0} 匯入列印參數：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "在加入印表機前，無法從 {0} 匯入列印參數。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "檔案 {0} 內沒有自訂列印參數可匯入" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "從 {0} 匯入列印參數失敗：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "列印參數 {0} 含有不正確的資料，無法匯入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "從 {0} 匯入列印參數失敗：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "已成功匯入列印參數 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "檔案 {0} 內未含有效的列印參數。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "列印參數 {0} 檔案類型未知或已損壞。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "自訂列印參數" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "列印參數缺少列印品質類型定義。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -942,14 +935,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "預切片檔案 {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "下一步" @@ -963,9 +955,9 @@ msgstr "群組 #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "關閉" @@ -980,40 +972,85 @@ msgstr "增加" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "取消" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "" + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "不覆寫" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "自訂列印參數" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "所有支援的類型 ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有檔案 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "未知" +msgid "Custom Material" +msgstr "自訂耗材" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "自訂" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1025,17 +1062,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "可用的網路印表機" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "自訂耗材" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "自訂" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1071,11 +1097,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "無法連上 Ultimaker 帳號伺服器。" -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "重試" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1260,62 +1281,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "送出報告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在載入印表機..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在設定場景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在載入介面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能載入一個 G-code 檔案。{0} 已跳過匯入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果載入 G-code，則無法開啟其他任何檔案。{0} 已跳過匯入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選擇的模型太小無法載入。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "印表機設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (寬度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1324,57 +1350,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (深度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "列印平台形狀" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "原點位於中心" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "熱床" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "熱箱" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "G-code 類型" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "列印頭設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X 最大值" @@ -1384,22 +1410,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "吊車高度" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "擠出機數目" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "起始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "結束 G-code" @@ -1478,7 +1504,7 @@ msgstr "外掛" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1673,11 +1699,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "機器" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Print Core" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1933,9 +1954,9 @@ msgid "Edit" msgstr "編輯" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "移除" @@ -1956,61 +1977,61 @@ msgctxt "@label" msgid "Type" msgstr "類型" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "韌體版本" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "位址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "此印表機未被設定為管理印表機群組。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "此印表機為 %1 印表機群組的管理者。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "該網路位址的印表機尚無回應。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "無效的 IP 位址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "請輸入有效的 IP 位址 。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "印表機網路位址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "輸入印表機的 IP 位址。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2065,17 +2086,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "在 %2 完成 %1" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "列印" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "網路連線列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "列印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "印表機選擇" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "平滑" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "網格類型" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "普通模型" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "做為支撐" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "與模型重疊處不建立支撐" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "修改與模型重疊處的設定" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "修改其他模型的填充設定" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "選擇設定" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "選擇對此模型的自訂設定" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "篩選…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "顯示全部" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "網格類型" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "普通模型" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "做為支撐" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "選擇設定" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "開啟專案" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "更新已有設定" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "新建" +msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "更新" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "新建" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "印表機群組" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "列印參數設定" @@ -2539,73 +2564,79 @@ msgid "How should the conflict in the profile be resolved?" msgstr "如何解决列印參數中的設定衝突？" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "名稱" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "不在列印參數中" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 覆寫" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "衍生自" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 覆寫" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "耗材設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "如何解决耗材的設定衝突？" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "參數顯示設定" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "模式" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "顯示設定：" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "載入專案時將清除列印平台上的所有模型。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "開啟" @@ -2712,54 +2743,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "每天啟動 Cura 時自動建立備份。" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "不支援" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "前一個" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "匯出" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "提示" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "通用" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "列印實驗" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "檢查清單" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "請選擇適用於 Ultimaker 2 的更新檔案。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Olsson Block" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2845,170 +2828,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "你確定要中斷列印嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "直徑更改確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新的耗材直徑設定為 %1 mm，這與目前的擠出機不相容。你要繼續嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "顯示名稱" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "品牌" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "耗材類型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "顏色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "屬性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "直徑" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "耗材成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "耗材重量" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "耗材長度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "每公尺成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "此耗材與 %1 相關聯，並共享其部份屬性。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "解除聯結耗材" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "描述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "附著資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "列印設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "啟用" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "建立" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "匯入" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "匯出" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "印表機" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "移除確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "你確定要移除 %1 嗎？這動作無法復原！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "匯入耗材設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "無法匯入耗材 %1：%2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功匯入耗材 %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "匯出耗材設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "無法匯出耗材至 %1：%2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "成功匯出耗材至：%1" @@ -3023,27 +3012,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "全選" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "已計算" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "目前" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "單位" @@ -3054,307 +3043,301 @@ msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "介面" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "語言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "貨幣：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "主題：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新啟動 Cura，新的設定才能生效。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "當設定變更時自動進行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "顯示區設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "以紅色凸顯模型缺少支撐的區域。如果沒有支撐這些區域將無法正常列印。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "顯示突出部分" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "當模型被選中時，視角將自動調整到最合適的觀察位置（模型處於正中央）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "當專案被選中時，自動置中視角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要讓 Cura 的預設縮放操作反轉嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反轉視角縮放方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟隨滑鼠方向進行縮放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "正交透視不支援游標縮放功能。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟隨滑鼠方向縮放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移動平台上的模型，使它們不再交錯嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "確保每個模型都保持分離" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "要將模型下降到碰觸列印平台嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動下降模型到列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 g-code 讀取器中顯示警告訊息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 讀取器中的警告訊息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "分層檢視要強制進入相容模式嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "強制分層檢視相容模式（需要重新啟動）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "使用哪種類型的攝影機渲染？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " -msgstr "攝影機渲染：" +msgid "Camera rendering:" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "透視" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "正交" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "開啟並儲存檔案" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "當模型的尺寸過大時，是否將模型自動縮小至列印範圍嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "縮小過大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "部份模型採用較大的單位(例如：公尺)，導致模型變得非常小，要將這些模型放大嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大過小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型載入後要設為被選擇的狀態嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "模型載入後選擇模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "是否自動將印表機名稱作為列印作業名稱的前綴？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "將印表機名稱前綴添加到列印作業名稱中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "儲存專案檔案時是否顯示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "儲存專案時顯示摘要對話框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "開啟專案檔案時的預設行為" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "開啟專案檔案時的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "每次都向我確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "總是作為一個專案開啟" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "總是匯入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "當你對列印參數進行更改然後切換到其他列印參數時，將顯示一個對話框詢問你是否要保留修改。你也可以選擇預設不顯示該對話框。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "當切換到另一組列印參數時，對於被修改過的設定的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "總是詢問" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "總是放棄修改過的設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "總是將修改過的設定轉移至新的列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "隱私權" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "當 Cura 啟動時，是否自動檢查更新？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "啟動時檢查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "你願意將關於你的列印資料以匿名形式發送到 Ultimaker 嗎？注意：我們不會記錄或發送任何模型、IP 地址或其他私人資料。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）發送列印資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "更多資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "實驗功能" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "使用多列印平台功能" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "使用多列印平台功能（需重啟軟體）" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3362,93 +3345,84 @@ msgid "Printers" msgstr "印表機" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "重命名" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "建立" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "建立列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "請為此參數提供一個名字。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "複製列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "匯入列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "匯出列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "印表機：%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "預設參數" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "自訂列印參數" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫值更新列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "捨棄目前更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此列印參數使用印表機指定的預設值，因此在下面的清單中沒有此設定項。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "你目前的設定與選定的列印參數相匹配。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局設定" @@ -3513,35 +3487,35 @@ msgstr "無標題" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "搜尋設定" +msgid "Search settings" +msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "將設定值複製到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "複製所有改變的設定值到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隱藏此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再顯示此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此設定顯示" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3573,17 +3547,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "影響因素" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "這個設定是所有擠出機共用的。修改它會同時更動到所有擠出機的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "這個數值是由每個擠出機的設定值解析出來的 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3594,7 +3568,7 @@ msgstr "" "\n" "單擊以復原列印參數的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3605,6 +3579,12 @@ msgstr "" "\n" "點擊以恢復計算得出的數值。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3645,26 +3625,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "允許列印邊緣或木筏。這將在你的物件周圍或下方添加一個容易切斷的平面區域。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "層高" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "你修改過部份列印參數設定。如果你想改變這些設定，請切換到自訂模式。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "品質參數無法用於目前的耗材和噴頭設定。請修改這些設定以啟用此品質參數。" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "目前正使用自訂列印參數。若要使用品質滑動條，在自訂分頁中選擇預設的列印參數" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3675,12 +3640,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "關閉" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "實驗功能" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "參數" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3691,6 +3661,11 @@ msgstr "" "\n" "點擊開啟列印參數管理器。" +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3818,11 +3793,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "耗材" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "常用" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "通用" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3858,16 +3838,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "關閉擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "列印平台（&B）" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "列印參數（&P）" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3945,12 +3915,12 @@ msgctxt "@header" msgid "Configurations" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "選擇設定" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "設定" @@ -3980,12 +3950,12 @@ msgctxt "@label" msgid "Enabled" msgstr "已啟用" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "耗材" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "在此耗材組合下，使用膠水以獲得較佳的附著。" @@ -4399,44 +4369,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "關閉 Cura 中" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "你確定要結束 Cura 嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "安裝軟體包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我們已經在你選擇的檔案中找到一個或多個 G-Code 檔案。你一次只能開啟一個 G-Code 檔案。若需開啟 G-Code 檔案，請僅選擇一個。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "新增印表機" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "新功能" @@ -4506,17 +4476,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "關於 Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "版本：%1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熔絲 3D 列印技術的的端對端解決方案。" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4525,122 +4495,122 @@ msgstr "" "Cura 由 Ultimaker B.V. 與社區合作開發。\n" "Cura 使用以下開源專案：" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "圖形用戶介面" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "應用框架" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "G-code 產生器" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "進程間通訊交互使用庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "編程語言" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "GUI 框架" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 框架綁定" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C / C++ 綁定庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "資料交換格式" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "科學計算函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "高速運算函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "用於處理 STL 檔案的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "用於處理平面物件的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "用於處理三角形網格的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "用於分析複雜網路的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "用於處理 3MF 檔案的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "用於檔案 metadata 和串流的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "串口通訊函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf 發現函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "多邊形剪輯函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 函式庫" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "字體" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "SVG 圖標" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux cross-distribution 應用程式部署" @@ -4660,32 +4630,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "儲存專案" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "列印平台" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "擠出機 %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 耗材" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "耗材" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "儲存時不再顯示專案摘要" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "儲存" @@ -4861,12 +4826,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "故障排除" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "印表機名稱" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "請為你的印表機取一個名稱" @@ -4925,6 +4890,31 @@ msgctxt "@button" msgid "Get started" msgstr "開始" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4985,16 +4975,6 @@ msgctxt "name" msgid "Model Checker" msgstr "模器檢查器" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "將所有設定內容轉儲至 HTML 檔案。" - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "上帝模式" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5005,16 +4985,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "韌體更新器" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "建立一個撫平的品質修改參數。" - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "參數撫平器" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5215,6 +5185,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "升級版本 3.3 到 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "" + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5415,16 +5395,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 列印參數寫入器" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "允許耗材製造商使用下拉式 UI 建立新的耗材和品質設定參數。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "列印參數設定助手" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5465,6 +5435,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 列印參數讀取器" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "合併有效設定" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "列印參數已被合併並啟用。" + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "將 X3g 寫入檔案" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "X3g 檔案" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "X3G 檔案" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Open Compressed Triangle Mesh" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "參數助手" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "參數助手" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "重試" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Print Core" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "與模型重疊處不建立支撐" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "修改與模型重疊處的設定" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "修改其他模型的填充設定" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "更新已有設定" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "不支援" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "前一個" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "提示" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "列印實驗" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "檢查清單" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "請選擇適用於 Ultimaker 2 的更新檔案。" + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Olsson Block" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "攝影機渲染：" + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "使用多列印平台功能" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "使用多列印平台功能（需重啟軟體）" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "預設參數" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "搜尋設定" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "層高" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "品質參數無法用於目前的耗材和噴頭設定。請修改這些設定以啟用此品質參數。" + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "目前正使用自訂列印參數。若要使用品質滑動條，在自訂分頁中選擇預設的列印參數" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "列印平台（&B）" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "列印參數（&P）" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "列印平台" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "將所有設定內容轉儲至 HTML 檔案。" + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "上帝模式" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "建立一個撫平的品質修改參數。" + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "參數撫平器" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "允許耗材製造商使用下拉式 UI 建立新的耗材和品質設定參數。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "列印參數設定助手" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "已透過網路連接。" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index 4c33b06539..a3e4614bcd 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-03 14:09+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index a8b0a7fc86..1f4a69c0cf 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 11:59+0200\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" @@ -1030,6 +1030,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3981,8 +3991,8 @@ msgstr "最小支撐介面面積" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "支撐介面區域的最小面積大小。面積小於此值的區域將不會產生支撐介面。" +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3991,8 +4001,8 @@ msgstr "最小支撐頂板面積" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "支撐頂板區域的最小面積大小。面積小於此值的區域將不會產生支撐頂板。" +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4001,8 +4011,8 @@ msgstr "最小支撐底板面積" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "支撐底板區域的最小面積大小。面積小於此值的區域將不會產生支撐底板。" +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4788,6 +4798,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "如果可列印的第一層下方有空的層，將其移除。假如「切片公差」設定為「排除」或「中間」，關閉此設定可能會導致空的第一層。" +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "最高解析度" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "切片後線段的最小尺寸。 如果你增加此設定值，網格的解析度將較低。 這允許印表機保持處理 G-code 的速度，並通過移除無法處理的網格細節來增加切片速度。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "最大空跑解析度" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "切片後空跑線段的最小尺寸。如果你增加此設定值，空跑移動時的轉角較不圓滑。這允許印表機快速的處理 G-code，但可能造成噴頭迴避模型時較不精確。" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "最大偏差值" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "降低「最高解析度」設定時允許的最大偏差範圍。假如你增加這個設定值，列印精度會降低，但 G-code 會較小。最大偏差是最高解析度的限制，所以當兩者衝突時，會以最大偏差成立為優先。" + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5163,36 +5203,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "切片層中周長小於此值的多邊形將被過濾掉。設定較低的值會花費較多的切片時間，以獲得較高解析度的網格。它主要用於高解析度的 SLA 印表機和具有大量細節的微小 3D 模型。" -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "最高解析度" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "切片後線段的最小尺寸。 如果你增加此設定值，網格的解析度將較低。 這允許印表機保持處理 G-code 的速度，並通過移除無法處理的網格細節來增加切片速度。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "最大空跑解析度" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "切片後空跑線段的最小尺寸。如果你增加此設定值，空跑移動時的轉角較不圓滑。這允許印表機快速的處理 G-code，但可能造成噴頭迴避模型時較不精確。" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "最大偏差值" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "降低「最高解析度」設定時允許的最大偏差範圍。假如你增加這個設定值，列印精度會降低，但 G-code 會較小。最大偏差是最高解析度的限制，所以當兩者衝突時，會以最大偏差成立為優先。" - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5333,16 +5343,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "滑行期間相對於擠出路徑的移動速度。建議採用略低於 100% 的值，因為在滑行移動期間喉管中的壓力會下降。" -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "交替表層旋轉" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "交替列印頂部/底部層的方向。通常它們只進行對角線列印。此設定添加純 X 和純 Y 方向。" - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5515,23 +5515,23 @@ msgstr "在每個線條部分改變的隨機點之間的平均距離。注意， #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "流量補償的最大擠出偏移量" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "最大補償距離（以毫米為單位）。" +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "流量補償因子" +msgid "Flow Rate Compensation Factor" +msgstr "" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "流量倍率 -> 移動距離。" +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5824,13 +5824,13 @@ msgstr "下一列印層與前一列印層的層高差。" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "適應性層高門檻值" +msgid "Adaptive Layers Topography Size" +msgstr "" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "決定是否使用較小層高的門檻值。此值會與一層中最陡坡度的 tan 值做比較。" +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5839,8 +5839,8 @@ msgstr "突出牆壁角度" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "牆壁突出的角度大於此值時，將使用突出牆壁的設定列印。當此值設定為 90 時，所有牆壁都不會被當作突出牆壁。" +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6219,18 +6219,18 @@ msgstr "細部模式速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "細部模式將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "第一層速度" +msgid "Small Feature Initial Layer Speed" +msgstr "" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "細部模式第一層將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "" #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6292,6 +6292,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在將模型從檔案中載入時套用在模型上的轉換矩陣。" +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撐介面區域的最小面積大小。面積小於此值的區域將不會產生支撐介面。" + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撐頂板區域的最小面積大小。面積小於此值的區域將不會產生支撐頂板。" + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "支撐底板區域的最小面積大小。面積小於此值的區域將不會產生支撐底板。" + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "交替表層旋轉" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "交替列印頂部/底部層的方向。通常它們只進行對角線列印。此設定添加純 X 和純 Y 方向。" + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "流量補償的最大擠出偏移量" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "最大補償距離（以毫米為單位）。" + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "流量補償因子" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "流量倍率 -> 移動距離。" + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "適應性層高門檻值" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "決定是否使用較小層高的門檻值。此值會與一層中最陡坡度的 tan 值做比較。" + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "牆壁突出的角度大於此值時，將使用突出牆壁的設定列印。當此值設定為 90 時，所有牆壁都不會被當作突出牆壁。" + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "細部模式將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "第一層速度" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "細部模式第一層將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "再一次經過頂部表面，但不擠出耗材。這是為了進一步融化頂部的塑料，打造更平滑的表面。" From 0d72563dd355aa32af1fe65869de54e0f5b957c6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 5 Nov 2019 13:34:44 +0100 Subject: [PATCH 892/994] Update i18n headers. part of CURA-6957 --- resources/i18n/de_DE/cura.po | 4 ++-- resources/i18n/de_DE/fdmextruder.def.json.po | 2 +- resources/i18n/de_DE/fdmprinter.def.json.po | 2 +- resources/i18n/es_ES/cura.po | 4 ++-- resources/i18n/es_ES/fdmextruder.def.json.po | 2 +- resources/i18n/es_ES/fdmprinter.def.json.po | 2 +- resources/i18n/fi_FI/cura.po | 4 ++-- resources/i18n/fi_FI/fdmextruder.def.json.po | 2 +- resources/i18n/fi_FI/fdmprinter.def.json.po | 2 +- resources/i18n/fr_FR/cura.po | 4 ++-- resources/i18n/fr_FR/fdmextruder.def.json.po | 2 +- resources/i18n/fr_FR/fdmprinter.def.json.po | 2 +- resources/i18n/it_IT/cura.po | 4 ++-- resources/i18n/it_IT/fdmextruder.def.json.po | 2 +- resources/i18n/it_IT/fdmprinter.def.json.po | 2 +- resources/i18n/ja_JP/cura.po | 4 ++-- resources/i18n/ja_JP/fdmextruder.def.json.po | 2 +- resources/i18n/ja_JP/fdmprinter.def.json.po | 2 +- resources/i18n/ko_KR/cura.po | 4 ++-- resources/i18n/ko_KR/fdmextruder.def.json.po | 2 +- resources/i18n/ko_KR/fdmprinter.def.json.po | 2 +- resources/i18n/nl_NL/cura.po | 4 ++-- resources/i18n/nl_NL/fdmextruder.def.json.po | 2 +- resources/i18n/nl_NL/fdmprinter.def.json.po | 2 +- resources/i18n/pl_PL/cura.po | 4 ++-- resources/i18n/pl_PL/fdmextruder.def.json.po | 2 +- resources/i18n/pl_PL/fdmprinter.def.json.po | 2 +- resources/i18n/pt_BR/cura.po | 4 ++-- resources/i18n/pt_BR/fdmextruder.def.json.po | 2 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 2 +- resources/i18n/pt_PT/cura.po | 4 ++-- resources/i18n/pt_PT/fdmextruder.def.json.po | 2 +- resources/i18n/pt_PT/fdmprinter.def.json.po | 2 +- resources/i18n/ru_RU/cura.po | 4 ++-- resources/i18n/ru_RU/fdmextruder.def.json.po | 2 +- resources/i18n/ru_RU/fdmprinter.def.json.po | 2 +- resources/i18n/tr_TR/cura.po | 4 ++-- resources/i18n/tr_TR/fdmextruder.def.json.po | 2 +- resources/i18n/tr_TR/fdmprinter.def.json.po | 2 +- resources/i18n/zh_CN/cura.po | 4 ++-- resources/i18n/zh_CN/fdmextruder.def.json.po | 2 +- resources/i18n/zh_CN/fdmprinter.def.json.po | 2 +- resources/i18n/zh_TW/cura.po | 4 ++-- resources/i18n/zh_TW/fdmextruder.def.json.po | 2 +- resources/i18n/zh_TW/fdmprinter.def.json.po | 2 +- 45 files changed, 60 insertions(+), 60 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 9017b8b977..ddf0170a31 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index 9359989f87..cc39f59f72 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index d85ce1ed9d..ce6b7e4d94 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index ce3a438694..c53968d906 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index 04a118ec58..5d849cfc50 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 934e56c1d9..3d1de90972 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index bf343a21fa..bfc110737f 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index 8985f36b7b..86dd3b3474 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 6b510789f7..3f1b71753b 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 79d0e86c5b..44dd836e32 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index 7cde86a4a1..59ade887b6 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index f24930392f..4afaa113c4 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 495ffcade5..a51bff4b33 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index 511f050b44..4d730ebf7c 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index cdc0f63972..3b19ea30d4 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index dde04f0ff1..2e9b6dc49a 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-23 14:15+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index a4c9feed7e..d2a33a2db3 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 6a88945fc5..0ff33898af 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 14:15+0200\n" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 6a1c7134e6..069944b9e2 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-23 14:16+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index bb0f37c410..944cbf0e15 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 69d74667d7..0694f2dc0b 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 54ed0baa67..2c2266855b 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index d2950e0c07..9d264238b7 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 72524ef7dd..c4b7d04912 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 783313bda3..bbdeb8109b 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-24 17:00+0200\n" "Last-Translator: Mariusz Matłosz \n" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 3983ca9326..4bd0384ad6 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index f0e76a3c21..6dabf74c37 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-30 15:45+0200\n" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 3b29a33510..39125eed3c 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-17 06:50-0300\n" "Last-Translator: Cláudio Sampaio \n" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index b062ad2883..9f91e3cfee 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-18 11:27+0100\n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index da63b1190e..68fa4ae9db 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-22 21:19-0300\n" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index d7defa46bc..c7ec507ebc 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index 3488999fd6..96925ac2d9 100644 --- a/resources/i18n/pt_PT/fdmextruder.def.json.po +++ b/resources/i18n/pt_PT/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-14 14:15+0100\n" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index d58ebe8b44..2054732139 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index ff01abfda5..56dbe7fe95 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index e673a97245..15c5decf0a 100644 --- a/resources/i18n/ru_RU/fdmextruder.def.json.po +++ b/resources/i18n/ru_RU/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 9d12ed2524..aee05e82f7 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 018b59e7aa..c837538e0f 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0200\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index b7152c5d85..43cfbf076c 100644 --- a/resources/i18n/tr_TR/fdmextruder.def.json.po +++ b/resources/i18n/tr_TR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 5541a3b254..2ff23f5b65 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 5e71b6f06e..bee70f1660 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-07-29 15:51+0100\n" "Last-Translator: Lionbridge \n" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index 8a1a46fb7c..c829558fe3 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 135d086d5c..e9e119ade0 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 14:18+0200\n" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index d127885fda..998a8c6726 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Cura 4.4\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" "PO-Revision-Date: 2019-09-19 23:41+0800\n" "Last-Translator: Zhang Heh Ji \n" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index a3e4614bcd..7eee73848d 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-03 14:09+0800\n" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 1f4a69c0cf..2b15f09f5c 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-09-23 11:59+0200\n" From 674d8d387b0769bbd698e69c6115286bedf4f31e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Nov 2019 14:52:12 +0100 Subject: [PATCH 893/994] Move translations for intent to it's own file CURA-6956 --- cura/Machines/Models/IntentCategoryModel.py | 28 +++------------------ cura/Machines/Models/IntentTranslations.py | 20 +++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 cura/Machines/Models/IntentTranslations.py diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index cb81aec3c7..a09d6ce3c4 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -2,8 +2,8 @@ #Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, QTimer -import collections from typing import TYPE_CHECKING, Optional, Dict +from cura.Machines.Models.IntentTranslations import intent_translations from cura.Machines.Models.IntentModel import IntentModel from cura.Settings.IntentManager import IntentManager @@ -29,26 +29,6 @@ class IntentCategoryModel(ListModel): modelUpdated = pyqtSignal() - # Translations to user-visible string. Ordered by weight. - # TODO: Create a solution for this name and weight to be used dynamically. - _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]]" - _translations["default"] = { - "name": catalog.i18nc("@label", "Default") - } - _translations["visual"] = { - "name": catalog.i18nc("@label", "Visual"), - "description": catalog.i18nc("@text", "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality.") - } - _translations["engineering"] = { - "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances.") - } - _translations["quick"] = { - "name": catalog.i18nc("@label", "Draft"), - "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") - } - - ## Creates a new model for a certain intent category. # \param The category to list the intent profiles for. def __init__(self, intent_category: str) -> None: @@ -99,15 +79,15 @@ class IntentCategoryModel(ListModel): "name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")), "description": IntentCategoryModel.translation(category, "description", None), "intent_category": category, - "weight": list(self._translations.keys()).index(category), + "weight": list(intent_translations).index(category), "qualities": qualities }) result.sort(key = lambda k: k["weight"]) self.setItems(result) - ## Get a display value for a category. See IntenCategoryModel._translations + ## Get a display value for a category. ## for categories and keys @staticmethod def translation(category: str, key: str, default: Optional[str] = None): - display_strings = IntentCategoryModel._translations.get(category, {}) + display_strings = intent_translations.get(category, {}) return display_strings.get(key, default) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py new file mode 100644 index 0000000000..fd6a2db9ee --- /dev/null +++ b/cura/Machines/Models/IntentTranslations.py @@ -0,0 +1,20 @@ +import collections +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") + +intent_translations = collections.OrderedDict() # type: "collections.OrderedDict[str, Dict[str, Optional[str]]]" +intent_translations["default"] = { + "name": catalog.i18nc("@label", "Default") +} +intent_translations["visual"] = { + "name": catalog.i18nc("@label", "Visual"), + "description": catalog.i18nc("@text", "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality.") +} +intent_translations["engineering"] = { + "name": catalog.i18nc("@label", "Engineering"), + "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances.") +} +intent_translations["quick"] = { + "name": catalog.i18nc("@label", "Draft"), + "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") +} \ No newline at end of file From ff8d8735de168a7ba61c1d8188f5ae353c4f786d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Nov 2019 14:57:44 +0100 Subject: [PATCH 894/994] Make the intents in QualityManagementModel also translated CURA-6956 --- cura/Machines/Models/QualityManagementModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index d8b0785778..6a73a1104f 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -14,6 +14,7 @@ from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_quality_changes_container from cura.Settings.IntentManager import IntentManager from cura.Machines.Models.MachineModelUtils import fetchLayerHeight +from cura.Machines.Models.IntentTranslations import intent_translations from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -336,7 +337,7 @@ class QualityManagementModel(ListModel): "quality_type": quality_type, "quality_changes_group": None, "intent_category": intent_category, - "section_name": catalog.i18nc("@label", intent_category.capitalize()), + "section_name": catalog.i18nc("@label", intent_translations.get(intent_category, {}).get("name", catalog.i18nc("@label", "Unknown"))), }) # Sort by quality_type for each intent category result = sorted(result, key = lambda x: (x["intent_category"], x["quality_type"])) From 04304c1515c7d0e56af37deb0683c903ac048fc9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Nov 2019 14:59:44 +0100 Subject: [PATCH 895/994] Correctly sort the intents in QualityManagementModel CURA-6956 --- cura/Machines/Models/QualityManagementModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 6a73a1104f..74dc8649d0 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -340,7 +340,8 @@ class QualityManagementModel(ListModel): "section_name": catalog.i18nc("@label", intent_translations.get(intent_category, {}).get("name", catalog.i18nc("@label", "Unknown"))), }) # Sort by quality_type for each intent category - result = sorted(result, key = lambda x: (x["intent_category"], x["quality_type"])) + + result = sorted(result, key = lambda x: (list(intent_translations).index(x["intent_category"]), x["quality_type"])) item_list += result # Create quality_changes group items From 179d2c924dd12ccf422372942b616d121214b01d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 6 Nov 2019 12:59:51 +0100 Subject: [PATCH 896/994] Fix typing --- cura/Machines/Models/IntentTranslations.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index fd6a2db9ee..155039003c 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -1,8 +1,11 @@ import collections +from typing import Dict, Optional + from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") -intent_translations = collections.OrderedDict() # type: "collections.OrderedDict[str, Dict[str, Optional[str]]]" + +intent_translations = collections.OrderedDict() # type: collections.OrderedDict[str, Dict[str, Optional[str]]] intent_translations["default"] = { "name": catalog.i18nc("@label", "Default") } @@ -17,4 +20,4 @@ intent_translations["engineering"] = { intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") -} \ No newline at end of file +} From 33f876d7490342fdfdd150d4c6669f1355158ea7 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 6 Nov 2019 15:43:22 +0100 Subject: [PATCH 897/994] Fix leapfrog bolt pro definition files --- .../definitions/leapfrog_bolt_pro.def.json | 232 +++++++++--------- .../leapfrog_bolt_pro_extruder_left.def.json | 6 +- .../leapfrog_bolt_pro_extruder_right.def.json | 10 +- 3 files changed, 121 insertions(+), 127 deletions(-) diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index 7f6e8ec2ec..09b9ecded5 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -1,117 +1,115 @@ - { - "version": 2, - "name": "Leapfrog Bolt Pro", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Karan and Vincent 20191104", - "manufacturer": "Leapfrog B.V.", - "category": "Other", - "platform": "leapfrog_bolt_pro_platform.stl", - "platform_offset": [0, 0, -14], - "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "supports_network_connection": false, - "has_materials": true, - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Brass 0.4", - "preferred_material": "leapfrog_epla_natural", - "variants_name": "Hot end", - "exclude_materials": [ - "generic_pla_175", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tpu_175", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pva", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - - "machine_extruder_trains": - { - "0": "leapfrog_bolt_pro_extruder_right", - "1": "leapfrog_bolt_pro_extruder_left" - } - }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Bolt Pro" }, - "machine_extruder_count": {"default_value": 2}, - "machine_center_is_zero": {"default_value": false}, - "machine_width": {"default_value": 302}, - "machine_height": {"default_value": 205}, - "machine_depth": {"default_value": 322}, - "machine_heated_bed": {"default_value": true}, - "machine_head_with_fans_polygon": {"default_value": [[-60, 110 ], [-60, -45], [60, -45 ], [60, 110]]}, - "machine_max_feedrate_z": {"default_value": 16.7 }, - "machine_max_feedrate_e": {"default_value": 50 }, - "machine_max_acceleration_z": {"default_value": 100 }, - "machine_acceleration": {"default_value": 400 }, - "machine_max_jerk_xy": {"default_value": 20 }, - "machine_max_jerk_z": {"default_value": 0.4 }, - "machine_max_jerk_e": {"default_value": 5 }, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "material_final_print_temperature": {"value": "default_material_print_temperature" }, - "material_initial_print_temperature": {"value": "default_material_print_temperature" }, - "gantry_height": {"value": "20"}, - "retraction_combing": { "default_value": "all" }, - "retraction_amount": {"default_value": 2}, - "adhesion_type": {"default_value": "skirt"}, - "skirt_line_count": {"default_value": 3}, - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, - "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, - "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, - "prime_tower_circular": {"default_value": false}, - "prime_tower_position_x": {"value": "169"}, - "prime_tower_position_y": {"value": "25"}, - "speed_travel": { "value": "200"}, - "build_volume_temperature": {"enabled": false}, - "material_standby_temperature": {"enabled": false } - } -} \ No newline at end of file +{ + "version": 2, + "name": "Leapfrog Bolt Pro", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Karan and Vincent 20191104", + "manufacturer": "Leapfrog B.V.", + "category": "Other", + "platform": "leapfrog_bolt_pro_platform.stl", + "platform_offset": [0, 0, -14], + "file_formats": "text/x-gcode", + "supports_usb_connection": false, + "supports_network_connection": false, + "has_materials": true, + "has_machine_quality": true, + "has_variants": true, + "preferred_variant_name": "Brass 0.4", + "preferred_material": "leapfrog_epla_natural", + "variants_name": "Hot end", + "exclude_materials": [ + "generic_pla_175", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pva", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "machine_extruder_trains": + { + "0": "leapfrog_bolt_pro_extruder_right", + "1": "leapfrog_bolt_pro_extruder_left" + } + }, + "overrides": { + "machine_name": {"default_value": "Leapfrog Bolt Pro" }, + "machine_extruder_count": {"default_value": 2}, + "machine_center_is_zero": {"default_value": false}, + "machine_width": {"default_value": 302}, + "machine_height": {"default_value": 205}, + "machine_depth": {"default_value": 322}, + "machine_heated_bed": {"default_value": true}, + "machine_head_with_fans_polygon": {"default_value": [[-60, 110 ], [-60, -45], [60, -45 ], [60, 110]]}, + "machine_max_feedrate_z": {"default_value": 16.7 }, + "machine_max_feedrate_e": {"default_value": 50 }, + "machine_max_acceleration_z": {"default_value": 100 }, + "machine_acceleration": {"default_value": 400 }, + "machine_max_jerk_xy": {"default_value": 20 }, + "machine_max_jerk_z": {"default_value": 0.4 }, + "machine_max_jerk_e": {"default_value": 5 }, + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "material_final_print_temperature": {"value": "default_material_print_temperature" }, + "material_initial_print_temperature": {"value": "default_material_print_temperature" }, + "gantry_height": {"value": "20"}, + "retraction_combing": { "default_value": "all" }, + "retraction_amount": {"default_value": 2}, + "adhesion_type": {"default_value": "skirt"}, + "skirt_line_count": {"default_value": 3}, + "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, + "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, + "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, + "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, + "prime_tower_position_x": {"value": "169" }, + "prime_tower_position_y": {"value": "25" }, + "speed_travel": { "value": "200" }, + "build_volume_temperature": {"enabled": false}, + "material_standby_temperature": {"enabled": false } + } +} diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json index f4ea1729fb..4ec859a60c 100644 --- a/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json +++ b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "leapfrog_bolt_pro_extruder_left", "version": 2, "name": "Left extruder", "inherits": "fdmextruder", @@ -7,7 +6,6 @@ "machine": "leapfrog_bolt_pro", "position": "1" }, - "overrides": { "extruder_nr": { "default_value": 1, @@ -18,6 +16,6 @@ "machine_nozzle_head_distance": { "default_value": 22 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X6 F1000\nG1 X-32 F4000\nG1 X6"} + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X6 F1000\nG1 X-32 F4000\nG1 X6" } } -} \ No newline at end of file +} diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json index 2a6662ab2f..fe27106afd 100644 --- a/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json +++ b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "leapfrog_bolt_pro_extruder_right", "version": 2, "name": "Right extruder", "inherits": "fdmextruder", @@ -7,17 +6,16 @@ "machine": "leapfrog_bolt_pro", "position": "0" }, - "overrides": { "extruder_nr": { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_head_distance": { "default_value": 22 }, - "machine_nozzle_offset_x": { "default_value": 0}, + "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X296 F1000\nG1 X334 F4000\nG1 X296"} + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X296 F1000\nG1 X334 F4000\nG1 X296"} } -} \ No newline at end of file +} From d346dd4090391b34057bf954ebeb1deed682a11a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 6 Nov 2019 15:43:43 +0100 Subject: [PATCH 898/994] Fix TestDefinitionContainer --- tests/Settings/TestDefinitionContainer.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 9e8e967692..38251e4397 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -3,11 +3,12 @@ import json # To check files for unnecessarily overridden properties. import os -import os.path import pytest #This module contains automated tests. from typing import Any, Dict import uuid +from unittest.mock import patch, MagicMock + import UM.Settings.ContainerRegistry #To create empty instance containers. import UM.Settings.ContainerStack #To set the container registry the container stacks use. from UM.Settings.DefinitionContainer import DefinitionContainer #To check against the class of DefinitionContainer. @@ -24,6 +25,10 @@ definition_filepaths = machine_filepaths + extruder_filepaths all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes")) all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images")) +# Loading definition files needs a functioning ContainerRegistry +cr = UM.Settings.ContainerRegistry.ContainerRegistry(None) + + @pytest.fixture def definition_container(): uid = str(uuid.uuid4()) @@ -39,7 +44,13 @@ def test_validateMachineDefinitionContainer(file_path, definition_container): if file_name == "fdmprinter.def.json" or file_name == "fdmextruder.def.json": return # Stop checking, these are root files. - assertIsDefinitionValid(definition_container, file_path) + from UM.VersionUpgradeManager import FilesDataUpdateResult + + mocked_vum = MagicMock() + mocked_vum.updateFilesData = lambda ct, v, fdl, fnl: FilesDataUpdateResult(ct, v, fdl, fnl) + with patch("UM.VersionUpgradeManager.VersionUpgradeManager.getInstance", MagicMock(return_value = mocked_vum)): + assertIsDefinitionValid(definition_container, file_path) + def assertIsDefinitionValid(definition_container, file_path): with open(file_path, encoding = "utf-8") as data: From da92c36afbd4af1e56b421adbaf562acd0e3ec31 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Nov 2019 17:22:58 +0100 Subject: [PATCH 899/994] Don't show tooltip immediately. --- .../Recommended/RecommendedQualityProfileSelector.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 5e58faec78..7c527f9448 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -160,14 +160,20 @@ Item enabled: model.description !== undefined acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks - onEntered: + Timer { - base.showTooltip( + id: intentTooltipTimer + interval: 500 + running: false + repeat: false + onTriggered: base.showTooltip( intentCategoryLabel, Qt.point(-(intentCategoryLabel.x - qualityRow.x) - UM.Theme.getSize("thick_margin").width, 0), model.description ) } + + onEntered: intentTooltipTimer.start() onExited: base.hideTooltip() } From 34c080c4bda51950b1355603640336a7c0fb89b0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 7 Nov 2019 09:55:41 +0100 Subject: [PATCH 900/994] Add _trustHook() to MockContainer CURA-6856 --- tests/Settings/MockContainer.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Settings/MockContainer.py b/tests/Settings/MockContainer.py index 533938c631..0400359154 100644 --- a/tests/Settings/MockContainer.py +++ b/tests/Settings/MockContainer.py @@ -78,6 +78,10 @@ class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): def getAllKeys(self): pass + # Should return false (or even throw an exception) if trust (or other verification) is invalidated. + def _trustHook(self, file_name: Optional[str]) -> bool: + return True + def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): pass From 5e255b548ee5b76aa7a84a438f5893029e2def50 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 7 Nov 2019 10:21:01 +0100 Subject: [PATCH 901/994] Fix TestLegacyProfileReader --- .../LegacyProfileReader/tests/TestLegacyProfileReader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py index 05f49017a3..cd0f681828 100644 --- a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py +++ b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py @@ -5,7 +5,6 @@ import configparser # An input for some functions we're testing. import os.path # To find the integration test .ini files. import pytest # To register tests with. import unittest.mock # To mock the application, plug-in and container registry out. -import os.path import sys sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")) @@ -16,6 +15,7 @@ import UM.Settings.InstanceContainer # To intercept the serialised data from the import LegacyProfileReader as LegacyProfileReaderModule # To get the directory of the module. + @pytest.fixture def legacy_profile_reader(): try: @@ -162,7 +162,7 @@ def test_read(legacy_profile_reader, file_name): plugin_registry.getPluginPath = unittest.mock.MagicMock(return_value = os.path.dirname(LegacyProfileReaderModule.__file__)) # Mock out the resulting InstanceContainer so that we can intercept the data before it's passed through the version upgrader. - def deserialize(self, data): # Intercepts the serialised data that we'd perform the version upgrade from when deserializing. + def deserialize(self, data, filename): # Intercepts the serialised data that we'd perform the version upgrade from when deserializing. global intercepted_data intercepted_data = data @@ -192,4 +192,4 @@ def test_read(legacy_profile_reader, file_name): assert parser["metadata"]["type"] == "quality_changes" assert parser["metadata"]["quality_type"] == "normal" assert parser["metadata"]["position"] == "0" - assert parser["metadata"]["setting_version"] == "5" # Yes, before we upgraded. \ No newline at end of file + assert parser["metadata"]["setting_version"] == "5" # Yes, before we upgraded. From ba6cf8eae5e4d8cca563b3695828acbbdb3fd107 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 7 Nov 2019 12:46:45 +0100 Subject: [PATCH 902/994] Fix window resize bug in LayerSlider concerning handle position Upper handle position would not be updated on resize CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 0c62dd01cf..6f608fe474 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -165,8 +165,9 @@ Item } onHeightChanged : { - // After a height change, the pixel-position of the lower handle is out of sync with the property value + // After a height change, the pixel-position of the handles is out of sync with the property value setLowerValue(lowerValue) + setUpperValue(upperValue) } // Upper handle From 19d334f35c7232e87f77e7de55126959bf5753d8 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Nov 2019 14:31:38 +0100 Subject: [PATCH 903/994] Fix typing imports. --- cura/Machines/Models/IntentTranslations.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index fd6a2db9ee..f78e8df128 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -1,5 +1,6 @@ import collections from UM.i18n import i18nCatalog +from typing import Dict, Optional catalog = i18nCatalog("cura") intent_translations = collections.OrderedDict() # type: "collections.OrderedDict[str, Dict[str, Optional[str]]]" From 0b450ef9f468899c8b36d18e02d8edcc67879757 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 7 Nov 2019 15:28:09 +0100 Subject: [PATCH 904/994] Fix linked materials not being found due to key casing CURA-6917 --- cura/Settings/ContainerManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 4a4a7b64dd..f2917ca21f 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -339,7 +339,7 @@ class ContainerManager(QObject): # \return A list of names of materials with the same GUID. @pyqtSlot("QVariant", bool, result = "QStringList") def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]: - same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(guid = material_node.guid) + same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(GUID = material_node.guid) if exclude_self: return [metadata["name"] for metadata in same_guid if metadata["base_file"] != material_node.base_file] else: From 6e79f489e2087c32c84d82390ad514340165ff96 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 7 Nov 2019 15:28:53 +0100 Subject: [PATCH 905/994] When multiple linked materials are found, only display the first CURA-6917 --- resources/qml/Preferences/Materials/MaterialsView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index f781497081..8ada441f1e 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -46,7 +46,7 @@ TabView { return "" } - return linkedMaterials.join(", "); + return linkedMaterials[0]; } function getApproximateDiameter(diameter) From 3636eed96441e3c7e57bb1c519b7efb8e4c1bc37 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Nov 2019 17:19:18 +0100 Subject: [PATCH 906/994] Instead of selecting first, return only uniques. part of CURA-6917 --- cura/Settings/ContainerManager.py | 4 ++-- resources/qml/Preferences/Materials/MaterialsView.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index f2917ca21f..ff129d35e2 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -341,9 +341,9 @@ class ContainerManager(QObject): def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]: same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(GUID = material_node.guid) if exclude_self: - return [metadata["name"] for metadata in same_guid if metadata["base_file"] != material_node.base_file] + return list({meta["name"] for meta in same_guid if meta["base_file"] != material_node.base_file}) else: - return [metadata["name"] for metadata in same_guid] + return list({meta["name"] for meta in same_guid}) ## Unlink a material from all other materials by creating a new GUID # \param material_id \type{str} the id of the material to create a new GUID for. diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 8ada441f1e..57253b9dff 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -46,7 +46,7 @@ TabView { return "" } - return linkedMaterials[0]; + return linkedMaterials; } function getApproximateDiameter(diameter) From a5aa4c75bac7a63ae7b413f47bdd9962d303ae93 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Fri, 8 Nov 2019 14:11:34 +0800 Subject: [PATCH 907/994] update gantry_height --- resources/definitions/makeblock_mcreate.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/makeblock_mcreate.def.json b/resources/definitions/makeblock_mcreate.def.json index db66ee4be5..a5cd2453ad 100644 --- a/resources/definitions/makeblock_mcreate.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -53,7 +53,7 @@ "default_value": "Marlin" }, "gantry_height": { - "default_value": 0 + "default_value": 15.0 }, "machine_extruder_count": { "default_value": 1 From 00078fd65939ac2e089099c733228374d71b1cc1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 13:38:42 +0100 Subject: [PATCH 908/994] Remove a bunch of unused imports --- cura/BuildVolume.py | 1 - cura/CuraApplication.py | 2 +- cura/Machines/Models/BuildPlateModel.py | 7 +------ cura/Machines/Models/DiscoveredPrintersModel.py | 1 - cura/Machines/VariantNode.py | 3 +-- cura/OAuth2/AuthorizationService.py | 2 -- cura/Settings/ExtruderManager.py | 3 +-- cura/Settings/IntentManager.py | 9 ++++----- plugins/3MFReader/__init__.py | 1 - .../LegacyProfileReader/tests/TestLegacyProfileReader.py | 1 - .../PerObjectSettingVisibilityHandler.py | 3 ++- plugins/SimulationView/NozzleNode.py | 1 - plugins/Toolbox/src/ConfigsModel.py | 3 +-- .../src/Models/Http/ClusterPrintJobStatus.py | 2 -- plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py | 3 ++- tests/API/TestAccount.py | 5 ++--- 16 files changed, 15 insertions(+), 32 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index bc8c806699..d8de8efd5a 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -26,7 +26,6 @@ catalog = i18nCatalog("cura") import numpy import math -import copy from typing import List, Optional, TYPE_CHECKING, Any, Set, cast, Iterable, Dict diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f88467d651..62e11680ce 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1796,7 +1796,7 @@ class CuraApplication(QtApplication): try: result = workspace_reader.preRead(file_path, show_dialog=False) return result == WorkspaceReader.PreReadResult.accepted - except Exception as e: + except Exception: Logger.logException("e", "Could not check file %s", file_url) return False diff --git a/cura/Machines/Models/BuildPlateModel.py b/cura/Machines/Models/BuildPlateModel.py index c52228cf76..3697dd2762 100644 --- a/cura/Machines/Models/BuildPlateModel.py +++ b/cura/Machines/Models/BuildPlateModel.py @@ -2,13 +2,8 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt - -from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel -from UM.Util import parseBool - -from cura.Machines.VariantType import VariantType class BuildPlateModel(ListModel): @@ -26,4 +21,4 @@ class BuildPlateModel(ListModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) self.setItems([]) - return \ No newline at end of file + return diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index a1b68ee1ae..c662334470 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -11,7 +11,6 @@ from UM.Util import parseBool from UM.OutputDevice.OutputDeviceManager import ManualDeviceAdditionAttempt if TYPE_CHECKING: - from PyQt5.QtCore import QObject from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from cura.CuraApplication import CuraApplication from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index b2115ca099..c9e3ec4913 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -1,13 +1,12 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, TYPE_CHECKING +from typing import TYPE_CHECKING from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal -from cura.Settings.cura_empty_instance_containers import empty_variant_container from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 68756f8df6..0848623410 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -3,7 +3,6 @@ import json from datetime import datetime, timedelta -import os from typing import Optional, TYPE_CHECKING from urllib.parse import urlencode @@ -14,7 +13,6 @@ from PyQt5.QtGui import QDesktopServices from UM.Logger import Logger from UM.Message import Message -from UM.Platform import Platform from UM.Signal import Signal from cura.OAuth2.LocalAuthorizationServer import LocalAuthorizationServer diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index b3d108e1aa..62bf396878 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -12,7 +12,6 @@ from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator from UM.Settings.ContainerRegistry import ContainerRegistry # Finding containers by ID. -from UM.Decorators import deprecated from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING, Union @@ -369,7 +368,7 @@ class ExtruderManager(QObject): printer = global_stack.getId(), expected = expected_extruder_definition_0_id, got = extruder_stack_0.definition.getId())) try: extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] - except IndexError as e: + except IndexError: # It still needs to break, but we want to know what extruder ID made it break. msg = "Unable to find extruder definition with the id [%s]" % expected_extruder_definition_0_id Logger.logException("e", msg) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c1d59fb84a..53d41281e8 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -1,13 +1,12 @@ -#Copyright (c) 2019 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot -from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING +from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING import cura.CuraApplication from UM.Logger import Logger from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_intent_container -from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: from UM.Settings.InstanceContainer import InstanceContainer @@ -116,7 +115,7 @@ class IntentManager(QObject): ## The intent that gets selected by default when no intent is available for # the configuration, an extruder can't match the intent that the user # selects, or just when creating a new printer. - def getDefaultIntent(self) -> InstanceContainer: + def getDefaultIntent(self) -> "InstanceContainer": return empty_intent_container @pyqtProperty(str, notify = intentCategoryChanged) diff --git a/plugins/3MFReader/__init__.py b/plugins/3MFReader/__init__.py index ce94bbe69c..d68338c35f 100644 --- a/plugins/3MFReader/__init__.py +++ b/plugins/3MFReader/__init__.py @@ -12,7 +12,6 @@ except ImportError: from . import ThreeMFWorkspaceReader from UM.i18n import i18nCatalog -from UM.Platform import Platform catalog = i18nCatalog("cura") diff --git a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py index 05f49017a3..c8d38bc177 100644 --- a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py +++ b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py @@ -5,7 +5,6 @@ import configparser # An input for some functions we're testing. import os.path # To find the integration test .ini files. import pytest # To register tests with. import unittest.mock # To mock the application, plug-in and container registry out. -import os.path import sys sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py index 3e1df1c7b8..61d0dbc0f0 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py @@ -1,7 +1,7 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal +from PyQt5.QtCore import pyqtProperty from UM.FlameProfiler import pyqtSlot from UM.Application import Application @@ -13,6 +13,7 @@ import UM.Settings.Models.SettingVisibilityHandler from cura.Settings.ExtruderManager import ExtruderManager #To get global-inherits-stack setting values from different extruders. from cura.Settings.SettingOverrideDecorator import SettingOverrideDecorator + ## The per object setting visibility handler ensures that only setting # definitions that have a matching instance Container are returned as visible. class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHandler.SettingVisibilityHandler): diff --git a/plugins/SimulationView/NozzleNode.py b/plugins/SimulationView/NozzleNode.py index 8a29871775..11b788c128 100644 --- a/plugins/SimulationView/NozzleNode.py +++ b/plugins/SimulationView/NozzleNode.py @@ -3,7 +3,6 @@ from UM.Application import Application from UM.Math.Color import Color -from UM.Math.Vector import Vector from UM.PluginRegistry import PluginRegistry from UM.Scene.SceneNode import SceneNode from UM.View.GL.OpenGL import OpenGL diff --git a/plugins/Toolbox/src/ConfigsModel.py b/plugins/Toolbox/src/ConfigsModel.py index dd54d53d93..9ba65caaa4 100644 --- a/plugins/Toolbox/src/ConfigsModel.py +++ b/plugins/Toolbox/src/ConfigsModel.py @@ -1,11 +1,10 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import re -from typing import Dict from PyQt5.QtCore import Qt, pyqtProperty from UM.Qt.ListModel import ListModel + ## Model that holds supported configurations (for material/quality packages). class ConfigsModel(ListModel): def __init__(self, parent = None): diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index e54d99f1e6..9794da1bbb 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -2,8 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. from typing import List, Optional, Union, Dict, Any -from PyQt5.QtCore import QUrl - from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel from .ClusterBuildPlate import ClusterBuildPlate diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index af9635d384..8419b3beeb 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -6,7 +6,7 @@ import io #To write config files to strings as if they were files. from typing import Dict, List, Optional, Tuple import UM.VersionUpgrade -from UM.Logger import Logger + ## Creates a new profile instance by parsing a serialised profile in version 1 # of the file format. @@ -20,6 +20,7 @@ def importFrom(serialised: str, filename: str) -> Optional["Profile"]: except (configparser.Error, UM.VersionUpgrade.FormatException, UM.VersionUpgrade.InvalidVersionException): return None + ## A representation of a profile used as intermediary form for conversion from # one format to the other. class Profile: diff --git a/tests/API/TestAccount.py b/tests/API/TestAccount.py index fd3d5aea55..d2708638cb 100644 --- a/tests/API/TestAccount.py +++ b/tests/API/TestAccount.py @@ -1,9 +1,8 @@ -from unittest.mock import MagicMock, patch, PropertyMock +from unittest.mock import MagicMock import pytest -from cura.API import CuraAPI, Account -from cura.OAuth2.AuthorizationService import AuthorizationService +from cura.API import Account from cura.OAuth2.Models import UserProfile From e2a387b246bf758189aa0dd24d5f646a9fe03bbb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 13:59:38 +0100 Subject: [PATCH 909/994] Add own getInstance for curaApplicaiton This makes the typing a bit smarter --- cura/CuraApplication.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 62e11680ce..d9ff9f2b5a 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1892,3 +1892,7 @@ class CuraApplication(QtApplication): op.push() from UM.Scene.Selection import Selection Selection.clear() + + @classmethod + def getInstance(cls, *args, **kwargs) -> "CuraApplication": + return cast(CuraApplication, super().getInstance(**kwargs)) From b8f76d7bfbc7f2f40010434e68c0ced506db6cef Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 14:13:19 +0100 Subject: [PATCH 910/994] Use QtApplication instead of Application In live code it doesn't cause problems, but the static checker found it --- cura/LayerPolygon.py | 4 ++-- cura/PlatformPhysics.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index a62083945b..0d6489aaa2 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -1,7 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from UM.Application import Application +from UM.Qt.QtApplication import QtApplication from typing import Any, Optional import numpy @@ -232,7 +232,7 @@ class LayerPolygon: @classmethod def getColorMap(cls): if cls.__color_map is None: - theme = Application.getInstance().getTheme() + theme = QtApplication.getInstance().getTheme() cls.__color_map = numpy.array([ theme.getColor("layerview_none").getRgbF(), # NoneType theme.getColor("layerview_inset_0").getRgbF(), # Inset0Type diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index d084c0dbf4..a411478b16 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -17,6 +17,7 @@ from cura.Scene import ZOffsetDecorator import random # used for list shuffling + class PlatformPhysics: def __init__(self, controller, volume): super().__init__() From 463822f10f8cee38b13adc43892dc2731ef8db71 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 16:50:23 +0100 Subject: [PATCH 911/994] Fix some typing issues --- cura/CuraApplication.py | 21 ++++++++++++--------- cura/Scene/ConvexHullNode.py | 7 +++++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index d9ff9f2b5a..aa4b242ecd 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1368,16 +1368,19 @@ class CuraApplication(QtApplication): for node in nodes: mesh_data = node.getMeshData() - if mesh_data and mesh_data.getFileName(): - job = ReadMeshJob(mesh_data.getFileName()) - job._node = node # type: ignore - job.finished.connect(self._reloadMeshFinished) - if has_merged_nodes: - job.finished.connect(self.updateOriginOfMergedMeshes) - job.start() - else: - Logger.log("w", "Unable to reload data because we don't have a filename.") + if mesh_data: + file_name = mesh_data.getFileName() + if file_name: + job = ReadMeshJob(file_name) + job._node = node # type: ignore + job.finished.connect(self._reloadMeshFinished) + if has_merged_nodes: + job.finished.connect(self.updateOriginOfMergedMeshes) + + job.start() + else: + Logger.log("w", "Unable to reload data because we don't have a filename.") @pyqtSlot("QStringList") def setExpandedCategories(self, categories: List[str]) -> None: diff --git a/cura/Scene/ConvexHullNode.py b/cura/Scene/ConvexHullNode.py index 90bf536308..e485c13304 100644 --- a/cura/Scene/ConvexHullNode.py +++ b/cura/Scene/ConvexHullNode.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional +from typing import Optional, TYPE_CHECKING from UM.Application import Application from UM.Math.Polygon import Polygon @@ -11,6 +11,9 @@ from UM.Math.Color import Color from UM.Mesh.MeshBuilder import MeshBuilder # To create a mesh to display the convex hull with. from UM.View.GL.OpenGL import OpenGL +if TYPE_CHECKING: + from UM.Mesh.MeshData import MeshData + class ConvexHullNode(SceneNode): shader = None # To prevent the shader from being re-built over and over again, only load it once. @@ -43,7 +46,7 @@ class ConvexHullNode(SceneNode): # The node this mesh is "watching" self._node = node - self._convex_hull_head_mesh = None + self._convex_hull_head_mesh = None # type: Optional[MeshData] self._node.decoratorsChanged.connect(self._onNodeDecoratorsChanged) self._onNodeDecoratorsChanged(self._node) From 4f569194ec4212368be13943e59939e22a5223ac Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 17:36:50 +0100 Subject: [PATCH 912/994] Add extra typing --- cura/Scene/BuildPlateDecorator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Scene/BuildPlateDecorator.py b/cura/Scene/BuildPlateDecorator.py index dfb465b7ad..758f79daaa 100644 --- a/cura/Scene/BuildPlateDecorator.py +++ b/cura/Scene/BuildPlateDecorator.py @@ -4,12 +4,12 @@ from cura.Scene.CuraSceneNode import CuraSceneNode ## Make a SceneNode build plate aware CuraSceneNode objects all have this decorator. class BuildPlateDecorator(SceneNodeDecorator): - def __init__(self, build_plate_number = -1): + def __init__(self, build_plate_number: int = -1) -> None: super().__init__() self._build_plate_number = None self.setBuildPlateNumber(build_plate_number) - def setBuildPlateNumber(self, nr): + def setBuildPlateNumber(self, nr: int) -> None: # Make sure that groups are set correctly # setBuildPlateForSelection in CuraActions makes sure that no single childs are set. self._build_plate_number = nr From 78e7aa2d21c6e53848b3202cdad52da075266be6 Mon Sep 17 00:00:00 2001 From: baddogg1231 Date: Sat, 9 Nov 2019 21:33:04 -0500 Subject: [PATCH 913/994] Added Ender 3 Prime Line to Start G-code Added the popular prime line for the Ender 3 as the default starting g-code and added a modification that works around the Cura 4.3.0 update that moves the print head to Z0 before starting the print, which moves the printhead down into the filament. --- resources/definitions/creality_ender3.def.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 645be52bc8..bbb2e03e86 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -26,7 +26,21 @@ [32, 34] ] }, + "machine_start_gcode": + { + "default_value": "; Ender 3 Custom Start G-code + G92 E0 ; Reset Extruder + G28 ; Home all axes + G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed + G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position + G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line + G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little + G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line + G92 E0 ; Reset Extruder + G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed + G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, "gantry_height": { "value": 25 } } -} \ No newline at end of file +} From f3e597d6847ae40e33e083f21b0e9a88e34855e1 Mon Sep 17 00:00:00 2001 From: baddogg1231 Date: Sat, 9 Nov 2019 21:36:13 -0500 Subject: [PATCH 914/994] Update creality_ender3.def.json --- resources/definitions/creality_ender3.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index bbb2e03e86..c15abb6f29 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -28,7 +28,8 @@ }, "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code + "default_value": " + ; Ender 3 Custom Start G-code G92 E0 ; Reset Extruder G28 ; Home all axes G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed From adaea90d50686315c6e1ef5d648e32766f144dfe Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Nov 2019 08:48:04 +0100 Subject: [PATCH 915/994] Fix typing --- plugins/SimulationView/SimulationView.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 3a7cb0d2fe..efb0fb7261 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -213,6 +213,8 @@ class SimulationView(CuraView): def beginRendering(self) -> None: scene = self.getController().getScene() renderer = self.getRenderer() + if renderer is None: + return if not self._ghost_shader: self._ghost_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "color.shader")) @@ -490,7 +492,11 @@ class SimulationView(CuraView): # Make sure the SimulationPass is created layer_pass = self.getSimulationPass() - self.getRenderer().addRenderPass(layer_pass) + renderer = self.getRenderer() + if renderer is not None: + return False + + renderer.addRenderPass(layer_pass) # Make sure the NozzleNode is add to the root nozzle = self.getNozzleNode() @@ -509,7 +515,7 @@ class SimulationView(CuraView): self._simulationview_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb())) if not self._composite_pass: - self._composite_pass = cast(CompositePass, self.getRenderer().getRenderPass("composite")) + self._composite_pass = cast(CompositePass, renderer.getRenderPass("composite")) self._old_layer_bindings = self._composite_pass.getLayerBindings()[:] # make a copy so we can restore to it later self._composite_pass.getLayerBindings().append("simulationview") @@ -525,7 +531,13 @@ class SimulationView(CuraView): self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) if self._nozzle_node: self._nozzle_node.setParent(None) - self.getRenderer().removeRenderPass(self._layer_pass) + + renderer = self.getRenderer() + if renderer is not None: + return False + + if self._layer_pass is not None: + renderer.removeRenderPass(self._layer_pass) if self._composite_pass: self._composite_pass.setLayerBindings(cast(List[str], self._old_layer_bindings)) self._composite_pass.setCompositeShader(cast(ShaderProgram, self._old_composite_shader)) From 896b73f8b31cbcc4b8404e8f6109bdd20a91319a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Nov 2019 08:57:34 +0100 Subject: [PATCH 916/994] Fix typing --- cura/Scene/BuildPlateDecorator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Scene/BuildPlateDecorator.py b/cura/Scene/BuildPlateDecorator.py index 758f79daaa..cff9f88f62 100644 --- a/cura/Scene/BuildPlateDecorator.py +++ b/cura/Scene/BuildPlateDecorator.py @@ -6,7 +6,7 @@ from cura.Scene.CuraSceneNode import CuraSceneNode class BuildPlateDecorator(SceneNodeDecorator): def __init__(self, build_plate_number: int = -1) -> None: super().__init__() - self._build_plate_number = None + self._build_plate_number = build_plate_number self.setBuildPlateNumber(build_plate_number) def setBuildPlateNumber(self, nr: int) -> None: @@ -19,7 +19,7 @@ class BuildPlateDecorator(SceneNodeDecorator): for child in self._node.getChildren(): child.callDecoration("setBuildPlateNumber", nr) - def getBuildPlateNumber(self): + def getBuildPlateNumber(self) -> int: return self._build_plate_number def __deepcopy__(self, memo): From 7495d7900f102c38945413112ce89f9cec24ace7 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Nov 2019 09:03:21 +0100 Subject: [PATCH 917/994] Fix is None check for typing --- plugins/SimulationView/SimulationView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index efb0fb7261..8318a68575 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -493,7 +493,7 @@ class SimulationView(CuraView): # Make sure the SimulationPass is created layer_pass = self.getSimulationPass() renderer = self.getRenderer() - if renderer is not None: + if renderer is None: return False renderer.addRenderPass(layer_pass) From 534b432e7e773bc8462fad3304bc782c0ed9717f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Nov 2019 09:08:13 +0100 Subject: [PATCH 918/994] Fix another is None check for typing --- plugins/SimulationView/SimulationView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 8318a68575..6d6f19c57c 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -533,7 +533,7 @@ class SimulationView(CuraView): self._nozzle_node.setParent(None) renderer = self.getRenderer() - if renderer is not None: + if renderer is None: return False if self._layer_pass is not None: From d93f6f25d20b231fe6c75e3b8d40d158d5c35ff5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 10:47:53 +0100 Subject: [PATCH 919/994] Prevent "sticky" tooltips When quickly moving the mouse in and out, the timer would still be running, so the tooltip would become active once the mouse moved out of the area. --- .../Recommended/RecommendedQualityProfileSelector.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 7c527f9448..337aff573f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -174,7 +174,11 @@ Item } onEntered: intentTooltipTimer.start() - onExited: base.hideTooltip() + onExited: + { + base.hideTooltip() + intentTooltipTimer.stop() + } } NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it. From 3e50cf5253106c77e073fe725289198768d1f05a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 13:43:04 +0100 Subject: [PATCH 920/994] Fix issues with makeblock definition --- resources/definitions/makeblock_mcreate.def.json | 2 +- resources/extruders/makeblock_mcreate_extruder_0.def.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/makeblock_mcreate.def.json b/resources/definitions/makeblock_mcreate.def.json index a5cd2453ad..7a2d575395 100644 --- a/resources/definitions/makeblock_mcreate.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -53,7 +53,7 @@ "default_value": "Marlin" }, "gantry_height": { - "default_value": 15.0 + "value": 15.0 }, "machine_extruder_count": { "default_value": 1 diff --git a/resources/extruders/makeblock_mcreate_extruder_0.def.json b/resources/extruders/makeblock_mcreate_extruder_0.def.json index aba794f40d..060ea634f8 100644 --- a/resources/extruders/makeblock_mcreate_extruder_0.def.json +++ b/resources/extruders/makeblock_mcreate_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "makeblock_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", From 4335acb19fe1cc246762198609ef0d1bb1bfbd6f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 14:27:31 +0100 Subject: [PATCH 921/994] Fix text jitter for the layer slider CURA-6854 --- plugins/SimulationView/SimulationSliderLabel.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index a241a50145..41eea7aa9e 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -46,6 +46,7 @@ UM.PointingRectangle { anchors { verticalCenter: parent.verticalCenter horizontalCenter: parent.horizontalCenter + alignWhenCentered: false } width: ((maximumValue + 1).toString().length + 1) * 8 * screenScaleFactor @@ -57,8 +58,9 @@ UM.PointingRectangle { Keys.onDownPressed: sliderLabelRoot.setValue(sliderLabelRoot.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) style: TextFieldStyle { - textColor: UM.Theme.getColor("setting_control_text") - font: UM.Theme.getFont("small") + textColor: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering background: Item { } } From 254dde5b0542127e1d051e57a7e778638a88e6dc Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 11 Nov 2019 15:02:49 +0100 Subject: [PATCH 922/994] REmove duplicate key machine_head_with_fans_polygon --- resources/definitions/fdmprinter.def.json | 28 ----------------------- 1 file changed, 28 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6fe5206cae..aafc01f219 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -412,34 +412,6 @@ "settable_per_meshgroup": false }, "machine_head_with_fans_polygon": - { - "label": "Machine Head Polygon", - "description": "A 2D silhouette of the print head (fan caps excluded).", - "type": "polygon", - "default_value": - [ - [ - -1, - 1 - ], - [ - -1, - -1 - ], - [ - 1, - -1 - ], - [ - 1, - 1 - ] - ], - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": false - }, - "machine_head_with_fans_polygon": { "label": "Machine Head & Fan Polygon", "description": "A 2D silhouette of the print head (fan caps included).", From e2414ed5c94ce8776f6b3b1a771da50c888b24f4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 15:58:39 +0100 Subject: [PATCH 923/994] Also log the exception when the connection failed to connect --- cura/OAuth2/AuthorizationHelpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py index 08309fa30e..9fc01ba50b 100644 --- a/cura/OAuth2/AuthorizationHelpers.py +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -99,7 +99,7 @@ class AuthorizationHelpers: }) except requests.exceptions.ConnectionError: # Connection was suddenly dropped. Nothing we can do about that. - Logger.log("w", "Something failed while attempting to parse the JWT token") + Logger.logException("w", "Something failed while attempting to parse the JWT token") return None if token_request.status_code not in (200, 201): Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text) From 7e3905059d06b051c6d4d3aab7ce4fb5ef26fce3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 16:10:26 +0100 Subject: [PATCH 924/994] Let the simulation slider label scale on actual font size CURA-6854 --- plugins/SimulationView/SimulationSliderLabel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index 41eea7aa9e..7474c287c2 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -49,7 +49,7 @@ UM.PointingRectangle { alignWhenCentered: false } - width: ((maximumValue + 1).toString().length + 1) * 8 * screenScaleFactor + width: ((maximumValue + 1).toString().length + 1) * UM.Theme.getFont("default").pixelSize text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array horizontalAlignment: TextInput.AlignHCenter From c3d1ab093146402169e7f7da2c38e8cc2bb35946 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 12 Nov 2019 08:40:50 +0100 Subject: [PATCH 925/994] Small refactor: Rename in UM. part of CURA-6856 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 3812c5255c..948751ab8b 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -721,7 +721,7 @@ class XmlMaterialProfile(InstanceContainer): if is_new_material: if ContainerRegistry.getInstance().isReadOnly(self.getId()): - ContainerRegistry.getInstance().setReadOnlyExplicitly(new_hotend_material.getId()) + ContainerRegistry.getInstance().setExplicitReadOnly(new_hotend_material.getId()) containers_to_add.append(new_hotend_material) # there is only one ID for a machine. Once we have reached here, it means we have already found From 2195dbaad05f026fefd5259a9214a96b6a67583f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 12 Nov 2019 10:31:45 +0100 Subject: [PATCH 926/994] Make backup window modal It could get hidden on osx quite easily, which is confusing as hell --- plugins/CuraDrive/src/qml/main.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/CuraDrive/src/qml/main.qml b/plugins/CuraDrive/src/qml/main.qml index 48bf3b6ea4..796a31e1d3 100644 --- a/plugins/CuraDrive/src/qml/main.qml +++ b/plugins/CuraDrive/src/qml/main.qml @@ -18,6 +18,7 @@ Window minimumHeight: Math.round(UM.Theme.getSize("modal_window_minimum").height) maximumWidth: Math.round(minimumWidth * 1.2) maximumHeight: Math.round(minimumHeight * 1.2) + modality: Qt.ApplicationModal width: minimumWidth height: minimumHeight color: UM.Theme.getColor("main_background") From 23d7dca1fc03189384c6b508a8b2b67ed5f86872 Mon Sep 17 00:00:00 2001 From: TheOgre Date: Tue, 12 Nov 2019 06:22:06 -0500 Subject: [PATCH 927/994] Added missing bracket, tidied up code Added a missing { before "default_value". Moved items around to match the layout of the current file. --- resources/definitions/creality_ender3.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index c15abb6f29..37d508d058 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -26,9 +26,7 @@ [32, 34] ] }, - "machine_start_gcode": - { - "default_value": " + "machine_start_gcode": { "default_value": " ; Ender 3 Custom Start G-code G92 E0 ; Reset Extruder G28 ; Home all axes From 558ed4b1e8f6a298db5b639ee39c2f49286bac7b Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 12:56:07 +0100 Subject: [PATCH 928/994] Change shadows on buildplate for one-at-a-time printing Inner: adhesion area Outer: full head In my opinion this allows the user to more easily see whether this object can be printed after another object. --- cura/Scene/ConvexHullDecorator.py | 11 +++++++++-- cura/Scene/ConvexHullNode.py | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index d3bd3be61f..9a2a0b9c7a 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -175,10 +175,17 @@ class ConvexHullDecorator(SceneNodeDecorator): self._convex_hull_node = None return - convex_hull = self.getConvexHull() + if self._global_stack \ + and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ + and not self.hasGroupAsParent(self._node): + # In one-at-a-time mode, every printed object gets it's own adhesion + printing_area = self.getAdhesionArea() + else: + printing_area = self.getConvexHull() + if self._convex_hull_node: self._convex_hull_node.setParent(None) - hull_node = ConvexHullNode.ConvexHullNode(self._node, convex_hull, self._raft_thickness, root) + hull_node = ConvexHullNode.ConvexHullNode(self._node, printing_area, self._raft_thickness, root) self._convex_hull_node = hull_node def _onSettingValueChanged(self, key: str, property_name: str) -> None: diff --git a/cura/Scene/ConvexHullNode.py b/cura/Scene/ConvexHullNode.py index 90bf536308..6aa71223e5 100644 --- a/cura/Scene/ConvexHullNode.py +++ b/cura/Scene/ConvexHullNode.py @@ -43,6 +43,7 @@ class ConvexHullNode(SceneNode): # The node this mesh is "watching" self._node = node + # Area of the head + fans for display as a shadow on the buildplate self._convex_hull_head_mesh = None self._node.decoratorsChanged.connect(self._onNodeDecoratorsChanged) @@ -76,14 +77,17 @@ class ConvexHullNode(SceneNode): if self.getParent(): if self.getMeshData() and isinstance(self._node, SceneNode) and self._node.callDecoration("getBuildPlateNumber") == Application.getInstance().getMultiBuildPlateModel().activeBuildPlate: + # The object itself (+ adhesion in one-at-a-time mode) renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8) if self._convex_hull_head_mesh: + # The full head. Rendered as a hint to the user: If this area overlaps another object A; this object + # cannot be printed after A, because the head would hit A while printing the current object renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8) return True def _onNodeDecoratorsChanged(self, node: SceneNode) -> None: - convex_hull_head = self._node.callDecoration("getConvexHullHead") + convex_hull_head = self._node.callDecoration("getConvexHullHeadFull") if convex_hull_head: convex_hull_head_builder = MeshBuilder() convex_hull_head_builder.addConvexPolygon(convex_hull_head.getPoints(), self._mesh_height - self._thickness) From 17b8e9930c32aebedab50dc697d43242b32a916f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 12 Nov 2019 13:28:12 +0100 Subject: [PATCH 929/994] Add handling for case where variant could not be found CURA-6975 --- cura/Machines/Models/BaseMaterialsModel.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 73d9d48b22..db660704b5 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -6,6 +6,7 @@ from typing import Dict, Set from PyQt5.QtCore import Qt, QTimer, pyqtSignal, pyqtProperty from UM.Qt.ListModel import ListModel +from UM.Logger import Logger import cura.CuraApplication # Imported like this to prevent a circular reference. from cura.Machines.ContainerTree import ContainerTree @@ -153,7 +154,12 @@ class BaseMaterialsModel(ListModel): if not extruder_stack: return nozzle_name = extruder_stack.variant.getName() - materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials + machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] + if nozzle_name not in machine_node.variants: + Logger.log("w", "Unable to find variant %s in container tree", nozzle_name) + self._available_materials = {} + return + materials = machine_node.variants[nozzle_name].materials approximate_material_diameter = extruder_stack.getApproximateMaterialDiameter() self._available_materials = {key: material for key, material in materials.items() if float(material.getMetaDataEntry("approximate_diameter", -1)) == approximate_material_diameter} From 8228c6a7433ce7c3302fb89b637efcfd2b5e7614 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 12 Nov 2019 14:22:18 +0100 Subject: [PATCH 930/994] Make sure position is not None CURA-6974 --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 72652f2987..8d69ffdc8d 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -140,7 +140,7 @@ class MachineNode(ContainerNode): elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") - if "position" in quality_changes: # An extruder profile. + if quality_changes.get("position") is not None: # An extruder profile. groups_by_name[name].metadata_per_extruder[int(quality_changes["position"])] = quality_changes else: # Global profile. groups_by_name[name].metadata_for_global = quality_changes From 77c194464e5edd70aedd255163513970dfcf8032 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 12 Nov 2019 14:33:54 +0100 Subject: [PATCH 931/994] Fix tests --- tests/Machines/TestVariantNode.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index bc860058a1..6e3a469877 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -139,6 +139,7 @@ def test_preferredMaterialExactMatch(empty_variant_node): "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), "preferred_material_base_file": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match. } + empty_variant_node.machine.preferred_material = "preferred_material_base_file" assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file"], "It should match exactly on this one since it's the preferred material." @@ -149,6 +150,7 @@ def test_preferredMaterialSubmaterial(empty_variant_node): "some_different_material": MagicMock(getMetaDataEntry = lambda x: 3), "preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material. } + empty_variant_node.machine.preferred_material = "preferred_material_base_file_aa04" assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well." @@ -160,6 +162,7 @@ def test_preferredMaterialDiameter(empty_variant_node): "preferred_material_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3. "preferred_material_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter. } + empty_variant_node.machine.preferred_material = "preferred_material_correct_diameter" assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter." From ae245ed0e58934ef6d44ff73d1eec20d8e3146e9 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 14:51:48 +0100 Subject: [PATCH 932/994] Cleanup: remove warnings for non-existing margins --- plugins/SimulationView/LayerSlider.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 6f608fe474..d6de45df9b 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -264,7 +264,7 @@ Item { id: upperHandleLabel - height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height + height: sliderRoot.handleSize anchors.bottom: parent.top anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter @@ -374,7 +374,7 @@ Item { id: lowerHandleLabel - height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height + height: sliderRoot.handleSize anchors.top: parent.bottom anchors.topMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter From f4b9c0fdd47b70c2f70031a59dd6cb880bd58959 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 14:52:11 +0100 Subject: [PATCH 933/994] Fix SimulationSliderLabel width --- plugins/SimulationView/SimulationSliderLabel.qml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index 7474c287c2..5245c5e92a 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -1,7 +1,6 @@ // Copyright (c) 2017 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.2 +import QtQuick 2.5 import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.1 @@ -40,6 +39,13 @@ UM.PointingRectangle { anchors.fill: parent } + TextMetrics { + id: maxValueMetrics + font: UM.Theme.getFont("default") + text: maximumValue + 1 // layers are 0 based, add 1 for display value + + } + TextField { id: valueLabel @@ -49,7 +55,6 @@ UM.PointingRectangle { alignWhenCentered: false } - width: ((maximumValue + 1).toString().length + 1) * UM.Theme.getFont("default").pixelSize text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array horizontalAlignment: TextInput.AlignHCenter @@ -61,7 +66,8 @@ UM.PointingRectangle { textColor: UM.Theme.getColor("text") font: UM.Theme.getFont("default") renderType: Text.NativeRendering - background: Item { } + // valueLabel width + background: Item { implicitWidth: maxValueMetrics.width + UM.Theme.getSize("default_margin").width } } onEditingFinished: { From 27b4e9a063e07a1b435aa8921d9dbfadc196f9b5 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 14:55:00 +0100 Subject: [PATCH 934/994] Refactor: simplify SimulationSliderLabel width --- plugins/SimulationView/SimulationSliderLabel.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index 5245c5e92a..9b29ae1d02 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -55,6 +55,7 @@ UM.PointingRectangle { alignWhenCentered: false } + width: maxValueMetrics.width + UM.Theme.getSize("default_margin").width text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array horizontalAlignment: TextInput.AlignHCenter @@ -66,8 +67,7 @@ UM.PointingRectangle { textColor: UM.Theme.getColor("text") font: UM.Theme.getFont("default") renderType: Text.NativeRendering - // valueLabel width - background: Item { implicitWidth: maxValueMetrics.width + UM.Theme.getSize("default_margin").width } + background: Item { } } onEditingFinished: { From c31c1dd6fbe62f57971a1f2e9c351ce9047fec8f Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 14:56:56 +0100 Subject: [PATCH 935/994] Refactor: simplify SimulationSliderLabel font metrics --- plugins/SimulationView/SimulationSliderLabel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index 9b29ae1d02..c1fb0f4de9 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -41,7 +41,7 @@ UM.PointingRectangle { TextMetrics { id: maxValueMetrics - font: UM.Theme.getFont("default") + font: valueLabel.font text: maximumValue + 1 // layers are 0 based, add 1 for display value } From eb4eddd49e1661be5dcf2ba49d83ae66c6b44e33 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 15:39:44 +0100 Subject: [PATCH 936/994] Add dict key check for a crash found in IntentManager CURA-6976 --- cura/Settings/IntentManager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 53d41281e8..cac27cc6bd 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -35,8 +35,12 @@ class IntentManager(QObject): # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: - material_node = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials[material_base_file] intent_metadatas = [] + materials = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials + if material_base_file not in materials: + return intent_metadatas + + material_node = materials[material_base_file] for quality_node in material_node.qualities.values(): for intent_node in quality_node.intents.values(): intent_metadatas.append(intent_node.getMetadata()) From fe27193c98d3b845e72cd58ed0535ca11d286dfb Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 12 Nov 2019 15:39:44 +0100 Subject: [PATCH 937/994] Add dict key check for a crash found in IntentManager CURA-6976 --- cura/Settings/IntentManager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c1d59fb84a..879db4f4de 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -36,8 +36,12 @@ class IntentManager(QObject): # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: - material_node = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials[material_base_file] intent_metadatas = [] + materials = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials + if material_base_file not in materials: + return intent_metadatas + + material_node = materials[material_base_file] for quality_node in material_node.qualities.values(): for intent_node in quality_node.intents.values(): intent_metadatas.append(intent_node.getMetadata()) From c08e7df277514fce8ed0a63ec280756bc1071a9a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 13 Nov 2019 11:10:03 +0100 Subject: [PATCH 938/994] Fix typing CURA-6976 --- cura/Settings/IntentManager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 879db4f4de..c53022fb6c 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -3,11 +3,13 @@ from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING -import cura.CuraApplication + from UM.Logger import Logger +from UM.Settings.InstanceContainer import InstanceContainer + +import cura.CuraApplication from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_intent_container -from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: from UM.Settings.InstanceContainer import InstanceContainer @@ -36,7 +38,7 @@ class IntentManager(QObject): # \return A list of metadata dictionaries matching the search criteria, or # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: - intent_metadatas = [] + intent_metadatas = [] # type: List[Dict[str, Any]] materials = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials if material_base_file not in materials: return intent_metadatas From 6127c99b64580d40103455875f2335b79e3b25b5 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2019 17:14:46 +0100 Subject: [PATCH 939/994] Added a public key so the 'enterprise' build will start. (sort of) part of CURA-6856 --- public_key.pem | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 public_key.pem diff --git a/public_key.pem b/public_key.pem new file mode 100644 index 0000000000..d07bb5477a --- /dev/null +++ b/public_key.pem @@ -0,0 +1,13 @@ +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEA8k8IJsNNM097VM2pJ5vxkHcLhHf76JCB0iyvqpUuIgl8Zcp78Go+ +WtVkbVBZPPfSSB8GwjEtxvZeWj3i6e3nfreuuzq2sw6Gh860wMiQbNgL+rYCU3m9 +XxvC0kXgZt+oYs13N5LTePV7BG4goa/JOcN8dsu2ptZKfgH6TPhwshMeOGr/RoGr +Jw1DrpvVeq/yTkrEHQHdtHr81GDghfK1vzxYQCt94MOFQCeShhtIC/jHelenJA94 +EpXqcWwCzFDfCQ3aXmCNHnMAsTHer7DWDfvsaUFyvJznrxkuQZIOQydGCNWhePTw +nGiaMydchknr9TT3F+W/yuCs4u5GdZsz7S+1qbG4hblXo6dV6CTzkdKhh/MzONPC +w6u1QBHUeTWN98zcTdtGIn53jjZEyYTodPnw/p4xLHVCju78a7uwm5U0rahcs6gw +658glo3uT41mmTrXTBIVTV+4f/dSrwJVpNfTy/E4wi6fiuFeN8ojqXqN+NbIymfJ +aKar/Jf/nM3QpEYaPz7yyn8PW8MZ7iomqnsPzyQGE1aymuEbw0ipTzMB7Oy/DfuU +d4JU8FFuVuWJj3zNaXW7U/ggzbt5vkdIP/VNVfNZf741J/yKRbCI0+j4mthbruVQ +Ka4aB2EVp1ozisHMaALg5tAeUgrQDZjGnVmSQLt+yFUUbG4e0XFQBb8CAwEAAQ== +-----END RSA PUBLIC KEY----- From 300990ad8948ceabd0370ae5f2258522993895d7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 14 Nov 2019 16:44:08 +0100 Subject: [PATCH 940/994] Add Traditional Chinese from one of our volunteer translators. part of CURA-6957 --- resources/i18n/zh_TW/cura.po | 90 ++++++++++---------- resources/i18n/zh_TW/fdmextruder.def.json.po | 2 +- resources/i18n/zh_TW/fdmprinter.def.json.po | 36 ++++---- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 998a8c6726..d82ada3caa 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Project-Id-Version: Cura 4.3\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" -"PO-Revision-Date: 2019-09-19 23:41+0800\n" +"PO-Revision-Date: 2019-11-10 21:31+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" @@ -279,17 +279,17 @@ msgstr "列印錯誤" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "找到新的雲端印表機" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "新找到的印表機已連接到你的帳戶，你可以在已發現的印表機清單中找到它們。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "不要再顯示這個訊息" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -494,7 +494,7 @@ msgstr "GIF 圖片" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -736,7 +736,7 @@ msgstr "不支援" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "預設值" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -749,7 +749,7 @@ msgstr "檔案已經存在" #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" -msgstr "檔案 {0} 已存在。你確定要覆蓋掉它嗎?" +msgstr "檔案 {0} 已存在。你確定要覆蓋掉它嗎？" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 @@ -988,37 +988,37 @@ msgstr "取消" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "預設值" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "外觀" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "外觀參數是設計來列印較高品質形狀和表面的視覺性原型和模型。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "工程" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "工程參數是設計來列印較高精度和較小公差的功能性原型和實際使用零件。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "草稿" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "草稿參數是設計來縮短時間，快速列印初始原型和概念驗證。" #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1289,7 +1289,7 @@ msgstr "正在載入印表機..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "正在設定偏好設定..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -1489,7 +1489,7 @@ msgstr "已安裝" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxErrorPage.qml:16 msgctxt "@info" msgid "Could not connect to the Cura Package database. Please check your connection." -msgstr "無法連上 Cura 軟體包資料庫。請檢查你的網路連線。" +msgstr "無法連上 Cura 套件資料庫。請檢查你的網路連線。" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/SmallRatingWidget.qml:27 msgctxt "@label" @@ -1606,12 +1606,12 @@ msgstr "你需要先登入才能進行評分" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/RatingWidget.qml:54 msgctxt "@label" msgid "You need to install the package before you can rate" -msgstr "你需要先安裝軟體包才能進行評分" +msgstr "你需要先安裝套件才能進行評分" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxFooter.qml:19 msgctxt "@info" msgid "You will need to restart Cura before changes in packages have effect." -msgstr "需重新啟動 Cura，軟體包的更動才能生效。" +msgstr "需重新啟動 Cura，套件的更動才能生效。" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxFooter.qml:45 msgctxt "@info:button" @@ -1737,7 +1737,7 @@ msgstr "網站" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml:16 msgctxt "@info" msgid "Fetching packages..." -msgstr "取得軟體包..." +msgstr "取得套件..." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml:91 msgctxt "@label" @@ -2480,17 +2480,17 @@ msgstr "做為支撐" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "修改重疊處設定" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "重疊處不建立支撐" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "只有填充" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "開啟專案" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "更新已有設定" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "新建設定" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2575,7 @@ msgstr "名稱" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "意圖" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3171,12 +3171,12 @@ msgstr "強制分層檢視相容模式（需要重新啟動）" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Cura 應該開啟在前次關閉時的位置嗎？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "開啟時復原視窗位置" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3186,7 +3186,7 @@ msgstr "使用哪種類型的攝影機渲染？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "攝影機渲染：" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3488,7 +3488,7 @@ msgstr "無標題" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "搜尋設定" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3583,7 +3583,7 @@ msgstr "" msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" -msgstr[0] "" +msgstr[0] "沒有擠出機 %2 用的 %1 參數。將使用預設參數" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" @@ -3664,7 +3664,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "自訂列印參數" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4362,7 +4362,7 @@ msgstr "Ultimaker Cura" #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:232 msgctxt "@label" msgid "This package will be installed after restarting." -msgstr "此軟體包將在重新啟動後安裝。" +msgstr "此套件將在重新啟動後安裝。" #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" @@ -4389,7 +4389,7 @@ msgstr "開啟檔案" #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" -msgstr "安裝軟體包" +msgstr "安裝套件" #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" @@ -4618,7 +4618,7 @@ msgstr "Linux cross-distribution 應用程式部署" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" -msgstr "我們已經在你所選擇的檔案中找到一個或多個專案檔案，但一次只能開啟一個專案檔案。我們建議只從那些檔案中匯入模型而不開啟專案。你要繼續操作嗎?" +msgstr "我們已經在你所選擇的檔案中找到一個或多個專案檔案，但一次只能開啟一個專案檔案。我們建議只從那些檔案中匯入模型而不開啟專案。你要繼續操作嗎？" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 msgctxt "@action:button" @@ -4893,27 +4893,27 @@ msgstr "開始" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "立體圖" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "前視圖" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "上視圖" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "左視圖" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "右視圖" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -4928,7 +4928,7 @@ msgstr "印表機設定操作" #: Toolbox/plugin.json msgctxt "description" msgid "Find, manage and install new Cura packages." -msgstr "查詢，管理和安裝新的 Cura 軟體包。" +msgstr "查詢，管理和安裝新的 Cura 套件。" #: Toolbox/plugin.json msgctxt "name" @@ -5188,12 +5188,12 @@ msgstr "升級版本 3.3 到 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "將設定從 Cura 4.3 版本升級至 4.4 版本。" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "升級版本 4.3 到 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -6355,7 +6355,7 @@ msgstr "Cura 列印參數讀取器" #~ msgctxt "@action:menu" #~ msgid "Browse packages..." -#~ msgstr "瀏覽軟體包..." +#~ msgstr "瀏覽套件..." #~ msgctxt "@action:inmenu menubar:view" #~ msgid "Expand/Collapse Sidebar" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index 7eee73848d..a3e4614bcd 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" +"Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-03 14:09+0800\n" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 2b15f09f5c..9a8da3fa81 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" +"Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" -"PO-Revision-Date: 2019-09-23 11:59+0200\n" +"PO-Revision-Date: 2019-11-13 23:45+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1033,12 +1033,12 @@ msgstr "底部列印層數，當由底部厚度來計算時層數時，會四捨 #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "起始底部層數" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "從列印平台列印的起始底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3992,7 @@ msgstr "最小支撐介面面積" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撐介面區域的最小面積大小。面積小於此值的區域將列印一般支撐。" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4002,7 @@ msgstr "最小支撐頂板面積" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撐頂板區域的最小面積大小。面積小於此值的區域將列印一般支撐。" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4012,7 @@ msgstr "最小支撐底板面積" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撐底板區域的最小面積大小。面積小於此值的區域將列印一般支撐。" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5516,22 @@ msgstr "在每個線條部分改變的隨機點之間的平均距離。注意， #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "流速補償的最大擠出偏移量" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "流速補償時耗材可移動的最大距離（以毫米為單位）。" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "流速補償係數" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "為了補償流速變化，耗材所移動的距離，以耗材一秒內擠出距離的百分比表示。" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5825,12 @@ msgstr "下一列印層與前一列印層的層高差。" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "適應性層高地形尺寸" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "兩個相鄰層之間的目標水平距離。 減少此設定將導致使用較薄的層高以使各層的邊緣更靠近。" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5840,7 @@ msgstr "突出牆壁角度" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "牆壁突出的角度大於此值時，將使用突出牆壁的設定列印。當此值設定為 90 時，所有牆壁都不會被當作突出牆壁。被支撐的突出牆壁也將不不會被當作突出牆壁。" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6220,17 @@ msgstr "細部模式速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "細部模式將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "細部模式起始層速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "第一層的細部模式將以正常列印速度的此百分比值列印。 較慢的列印有助於黏合和精度。" #: fdmprinter.def.json msgctxt "command_line_settings label" From ed63a9037d9fbb504405469eb79e28c618467ca6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 14 Nov 2019 16:47:08 +0100 Subject: [PATCH 941/994] Add raw Lionbridge translations. part of CURA-6957 --- resources/i18n/de_DE/cura.po | 63 ++++++++++---------- resources/i18n/de_DE/fdmprinter.def.json.po | 35 ++++++----- resources/i18n/es_ES/cura.po | 64 ++++++++++---------- resources/i18n/es_ES/fdmprinter.def.json.po | 35 ++++++----- resources/i18n/fr_FR/cura.po | 63 ++++++++++---------- resources/i18n/fr_FR/fdmprinter.def.json.po | 36 +++++++----- resources/i18n/it_IT/cura.po | 64 ++++++++++---------- resources/i18n/it_IT/fdmprinter.def.json.po | 37 +++++++----- resources/i18n/ja_JP/cura.po | 62 ++++++++++---------- resources/i18n/ja_JP/fdmprinter.def.json.po | 30 +++++----- resources/i18n/ko_KR/cura.po | 62 ++++++++++---------- resources/i18n/ko_KR/fdmprinter.def.json.po | 30 +++++----- resources/i18n/nl_NL/cura.po | 62 ++++++++++---------- resources/i18n/nl_NL/fdmprinter.def.json.po | 34 ++++++----- resources/i18n/pt_PT/cura.po | 65 +++++++++++---------- resources/i18n/pt_PT/fdmprinter.def.json.po | 34 ++++++----- resources/i18n/ru_RU/cura.po | 62 ++++++++++---------- resources/i18n/ru_RU/fdmprinter.def.json.po | 33 ++++++----- resources/i18n/tr_TR/cura.po | 62 ++++++++++---------- resources/i18n/tr_TR/fdmprinter.def.json.po | 33 ++++++----- resources/i18n/zh_CN/cura.po | 62 ++++++++++---------- resources/i18n/zh_CN/fdmprinter.def.json.po | 30 +++++----- 22 files changed, 552 insertions(+), 506 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index ddf0170a31..1fb0b93e39 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -279,17 +279,17 @@ msgstr "Druckfehler" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF-Bilddatei" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Nicht unterstützt" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,38 @@ msgstr "Abbrechen" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visuell" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Das visuelle Profil wurde für den Druck visueller Prototypen und Modellen entwickelt, bei denen das Ziel eine hohe visuelle Qualität und eine hohe Oberflächenqualität" +" ist." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Das Engineering-Profil ist für den Druck von Funktionsprototypen und Endnutzungsteilen gedacht, bei denen Präzision gefragt ist und engere Toleranzen gelten." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Entwurf" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Das Entwurfsprofil wurde für erste Prototypen und die Konzeptvalidierung entwickelt, um einen deutlich schnelleren Druck zu ermöglichen." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1289,7 @@ msgstr "Geräte werden geladen..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Erstellungen werden eingerichtet ..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2479,17 +2480,17 @@ msgstr "Als Stützstruktur drucken" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2504,12 +2505,12 @@ msgstr "Projekt öffnen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2574,7 +2575,7 @@ msgstr "Name" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3172,12 +3173,12 @@ msgstr "Schichtenansicht Kompatibilitätsmodus erzwingen (Neustart erforderlich) #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Sollte Cura sich an der Stelle öffnen, an der das Programm geschlossen wurde?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Fensterposition beim Start wiederherstellen" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3187,7 +3188,7 @@ msgstr "Welches Kamera-Rendering sollte verwendet werden?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3489,7 +3490,7 @@ msgstr "Unbenannt" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3666,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4901,27 +4902,27 @@ msgstr "Erste Schritte" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3D-Ansicht" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Vorderansicht" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Draufsicht" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Ansicht von links" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Ansicht von rechts" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5196,12 +5197,12 @@ msgstr "Upgrade von Version 3.3 auf 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index ce6b7e4d94..142db39f5b 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -1033,12 +1033,13 @@ msgstr "Die Anzahl der unteren Schichten. Wenn diese anhand der unteren Dicke be #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Erste untere Schichten" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Die Anzahl der ersten Schichten, die auf die Druckplatte aufgetragen werden. Wenn diese anhand der unteren Dicke berechnet werden, wird der Wert auf eine" +" ganze Zahl auf- oder abgerundet." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3993,8 @@ msgstr "Mindestbereich Stützstruktur-Schnittstelle" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Mindestflächenbreite für Stützstruktur-Schnittstellen-Polygone. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden als normale Stützstruktur" +" gedruckt." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4004,7 @@ msgstr "Mindestbereich Stützstrukturdach" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Mindestfläche für die Dächer der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden als normale Stützstruktur gedruckt." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4014,7 @@ msgstr "Mindestbereich Stützstrukturboden" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Mindestfläche für die Dächer der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden als normale Stützstruktur gedruckt." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5518,23 @@ msgstr "Der durchschnittliche Abstand zwischen den willkürlich auf jedes Linien #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Ausgleich Durchflussrate max. Extrusionswirkung" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "Die maximale Strecke (in mm), die das Filament bewegt werden kann, um Änderungen der Durchflussrate zu kompensieren." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Ausgleichsfaktor Durchflussrate" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Wie weit das Filament bewegt werden kann, um Änderungen der Durchflussrate zu kompensieren – als Prozentsatz der Strecke, die das Filament sich während" +" einer Sekunde Extrusion bewegen würde." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5828,13 @@ msgstr "Der Höhenunterscheid der nächsten Schichthöhe im Vergleich zur vorher #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Topographische Größe der Anpassschichten" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Horizontaler Abstand zwischen zwei angrenzenden Schichten. Bei Einstellung eines niedrigeren Werts werden dünnere Schichten aufgetragen, damit die Kanten" +" der Schichten enger aneinander liegen." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5844,8 @@ msgstr "Winkel für überhängende Wände" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Wände, die über diesen Winkel hinaus hängen, werden mithilfe der Einstellungen für Winkel für überhängende Wände gedruckt. Wenn der Wert 90 beträgt, werden" +" keine Wände als überhängend behandelt. Überhänge, die von Stützstrukturen gestützt werden, werden ebenfalls nicht als Überhang behandelt." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6225,17 @@ msgstr "Detailgeschwindigkeit" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Geschwindigkeit der ersten Schicht von Details" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index c53968d906..ed2afbe602 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -279,17 +279,17 @@ msgstr "Error de impresión" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "Imagen GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "No compatible" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,39 @@ msgstr "Cancelar" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visual" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "El perfil visual está diseñado para imprimir prototipos y modelos visuales con la intención de obtener una alta calidad visual y de superficies." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "El perfil de ingeniería ha sido diseñado para imprimir prototipos funcionales y piezas de uso final con la intención de obtener una mayor precisión y tolerancias" +" más precisas." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Boceto" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "El perfil del boceto ha sido diseñado para imprimir los prototipos iniciales y la validación del concepto con la intención de reducir el tiempo de impresión" +" de manera considerable." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1290,7 @@ msgstr "Cargando máquinas..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Configurando preferencias...." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2480,17 +2482,17 @@ msgstr "Imprimir como soporte" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2507,12 @@ msgstr "Abrir proyecto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2577,7 @@ msgstr "Nombre" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3175,12 @@ msgstr "Forzar modo de compatibilidad de la vista de capas (necesario reiniciar) #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "¿Debería abrirse Cura en el lugar donde se cerró?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Restaurar la posición de la ventana al inicio" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3190,7 @@ msgstr "¿Qué tipo de renderizado de cámara debería usarse?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3492,7 @@ msgstr "Sin título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3669,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4902,27 +4904,27 @@ msgstr "Empezar" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Vista en 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Vista frontal" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Vista superior" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Vista del lado izquierdo" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Vista del lado derecho" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5197,12 +5199,12 @@ msgstr "Actualización de la versión 3.3 a la 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 3d1de90972..4da8cfa20c 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -1033,12 +1033,13 @@ msgstr "Número de capas inferiores. Al calcularlo por el grosor inferior, este #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Capas inferiores iniciales" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "El número de capas inferiores iniciales, desde la capa de impresión hacia arriba. Al calcularlo por el grosor inferior, este valor se redondea a un número" +" entero." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3993,8 @@ msgstr "Área de la interfaz de soporte mínima" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamaño del área mínima para los polígonos de la interfaz de soporte. Los polígonos que posean un área de menor tamaño que este valor se imprimirán como" +" soporte normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4004,7 @@ msgstr "Área de los techos del soporte mínima" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamaño del área mínima para los techos del soporte. Los polígonos que posean un área de menor tamaño que este valor se imprimirán como soporte normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4014,7 @@ msgstr "Área de los suelos del soporte mínima" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamaño del área mínima para los suelos del soporte. Los polígonos que posean un área de menor tamaño que este valor se imprimirán como soporte normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5518,23 @@ msgstr "Distancia media entre los puntos aleatorios introducidos en cada segment #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Desplazamiento de extrusión máximo del factor de compensación del caudal" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "La distancia máxima en mm para mover el filamento con el fin de compensar los cambios en el caudal." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Factor de compensación del caudal" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "La distancia para mover el filamento con el fin de compensar los cambios en el caudal, como porcentaje de la distancia a la que se movería el filamento" +" en un segundo de extrusión." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5828,13 @@ msgstr "La diferencia de altura de la siguiente altura de capa en comparación c #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Tamaño de la topografía de las capas de adaptación" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Distancia horizontal objetivo entre dos capas adyacentes. Si se reduce este ajuste, se tendrán que utilizar capas más finas para acercar más los bordes" +" de las capas." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5844,8 @@ msgstr "Ángulo de voladizo de pared" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Las paredes con un ángulo de voladizo mayor que este se imprimirán con los ajustes de voladizo de pared. Cuando el valor sea 90, no se aplicará la condición" +" de voladizo a la pared. El voladizo que se apoya en el soporte tampoco se tratará como voladizo." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6225,17 @@ msgstr "Velocidad de pequeñas partes" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Velocidad de la capa inicial de partes pequeñas" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 44dd836e32..bc8db83d25 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -279,17 +279,17 @@ msgstr "Erreur d'impression" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "Image GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Non pris en charge" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,38 @@ msgstr "Annuler" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visuel" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Le profil visuel est conçu pour imprimer des prototypes et des modèles visuels dans le but d'obtenir une qualité visuelle et de surface élevée." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Le profil d'ingénierie est conçu pour imprimer des prototypes fonctionnels et des pièces finales dans le but d'obtenir une meilleure précision et des tolérances" +" plus étroites." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Ébauche" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "L'ébauche du profil est conçue pour imprimer les prototypes initiaux et la validation du concept dans le but de réduire considérablement le temps d'impression." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1289,7 @@ msgstr "Chargement des machines..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Configuration des préférences..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2479,17 +2480,17 @@ msgstr "Imprimer comme support" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2504,12 +2505,12 @@ msgstr "Ouvrir un projet" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2574,7 +2575,7 @@ msgstr "Nom" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3172,12 +3173,12 @@ msgstr "Forcer l'affichage de la couche en mode de compatibilité (redémarrage #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Est-ce que Cura devrait ouvrir à l'endroit où il a été fermé ?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Restaurer la position de la fenêtre au démarrage" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3187,7 +3188,7 @@ msgstr "Quel type de rendu de la caméra doit-il être utilisé?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3489,7 +3490,7 @@ msgstr "Sans titre" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3666,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4901,27 +4902,27 @@ msgstr "Prise en main" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Vue 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Vue de face" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Vue du dessus" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Vue gauche" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Vue droite" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5196,12 +5197,12 @@ msgstr "Mise à niveau de 3.3 vers 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 4afaa113c4..80642448ea 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -1033,12 +1033,13 @@ msgstr "Le nombre de couches inférieures. Lorsqu'elle est calculée par l'épai #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Couches inférieures initiales" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Le nombre de couches inférieures initiales à partir du haut du plateau. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie" +" à un nombre entier." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3993,8 @@ msgstr "Surface minimale de l'interface de support" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Taille minimale de la surface des polygones d'interface de support. Les polygones dont la surface est inférieure à cette valeur ne seront pas imprimés" +" comme support normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4004,8 @@ msgstr "Surface minimale du plafond de support" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Taille minimale de la surface des plafonds du support. Les polygones dont la surface est inférieure à cette valeur ne seront pas imprimés comme support" +" normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4015,7 @@ msgstr "Surface minimale du bas de support" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Taille minimale de la surface des bas du support. Les polygones dont la surface est inférieure à cette valeur ne seront pas imprimés comme support normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5519,23 @@ msgstr "Distance moyenne entre les points ajoutés aléatoirement sur chaque seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Décalage d'extrusion max. pour compensation du débit" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "La distance maximale en mm pour déplacer le filament afin de compenser les variations du débit." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Facteur de compensation du débit" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "La distance de déplacement du filament pour compenser les variations du débit, en pourcentage de la distance de déplacement du filament en une seconde" +" d'extrusion." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5829,13 @@ msgstr "Différence de hauteur de la couche suivante par rapport à la précéde #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Taille de la topographie des couches adaptatives" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Distance horizontale cible entre deux couches adjacentes. La réduction de ce paramètre entraîne l'utilisation de couches plus fines pour rapprocher les" +" bords des couches." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5845,8 @@ msgstr "Angle de parois en porte-à-faux" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune" +" paroi ne sera considérée comme étant en porte-à-faux. La saillie soutenue par le support ne sera pas non plus considérée comme étant en porte-à-faux." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6226,17 @@ msgstr "Vitesse de petite structure" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Vitesse de la couche initiale de petite structure" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index a51bff4b33..ab8bd7b2d2 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -279,17 +279,17 @@ msgstr "Errore di stampa" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "Immagine GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Non supportato" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,39 @@ msgstr "Annulla" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visivo" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Il profilo visivo è destinato alla stampa di prototipi e modelli visivi, con l'intento di ottenere una qualità visiva e della superficie elevata." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Il profilo di progettazione è destinato alla stampa di prototipi funzionali e di componenti d'uso finale, allo scopo di ottenere maggiore precisione e" +" tolleranze strette." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Bozza" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Il profilo bozza è destinato alla stampa dei prototipi iniziali e alla convalida dei concept, con l'intento di ridurre in modo significativo il tempo di" +" stampa." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1290,7 @@ msgstr "Caricamento macchine in corso..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Impostazione delle preferenze..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2480,17 +2482,17 @@ msgstr "Stampa come supporto" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2507,12 @@ msgstr "Apri progetto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2577,7 @@ msgstr "Nome" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3175,12 @@ msgstr "Forzare la modalità di compatibilità visualizzazione strato (riavvio n #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Aprire Cura nel punto in cui è stato chiuso?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Ripristinare la posizione della finestra all'avvio" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3190,7 @@ msgstr "Quale tipo di rendering della fotocamera è necessario utilizzare?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3492,7 @@ msgstr "Senza titolo" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3669,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4902,27 +4904,27 @@ msgstr "Per iniziare" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Visualizzazione 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Visualizzazione frontale" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Visualizzazione superiore" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Vista sinistra" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Vista destra" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5197,12 +5199,12 @@ msgstr "Aggiornamento della versione da 3.3 a 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 3b19ea30d4..c16f2eff85 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -1033,12 +1033,13 @@ msgstr "Indica il numero degli strati inferiori. Quando calcolato mediante lo sp #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Layer inferiori iniziali" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Il numero di layer inferiori iniziali, dal piano di stampa verso l'alto. Quando viene calcolato mediante lo spessore inferiore, questo valore viene arrotondato" +" a un numero intero." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3993,8 @@ msgstr "Area minima interfaccia supporto" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Dimensione minima dell'area per i poligoni dell'interfaccia di supporto. I poligoni con un'area più piccola rispetto a questo valore saranno stampati come" +" supporto normale." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4004,8 @@ msgstr "Area minima parti superiori supporto" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Dimensione minima dell'area per le parti superiori del supporto. I poligoni con un'area più piccola rispetto a questo valore saranno stampati come supporto" +" normale." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4015,8 @@ msgstr "Area minima parti inferiori supporto" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Dimensione minima dell'area per le parti inferiori del supporto. I poligoni con un'area più piccola rispetto a questo valore saranno stampati come supporto" +" normale." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5520,23 @@ msgstr "Indica la distanza media tra i punti casuali introdotti su ciascun segme #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Offset massimo dell'estrusione di compensazione del flusso" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "Distanza massima in mm di spostamento del filamento per compensare le modifiche nella velocità di flusso." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Fattore di compensazione del flusso" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Distanza di spostamento del filamento al fine di compensare le modifiche nella velocità di flusso, come percentuale della distanza di spostamento del filamento" +" in un secondo di estrusione." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5830,13 @@ msgstr "La differenza in altezza dello strato successivo rispetto al precedente. #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Dimensione della topografia dei layer adattivi" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Distanza orizzontale target tra due layer adiacenti. Riducendo questa impostazione, i layer più sottili verranno utilizzati per avvicinare i margini dei" +" layer." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5846,8 @@ msgstr "Angolo parete di sbalzo" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Le pareti con uno sbalzo superiore a quest'angolo saranno stampate con le impostazioni per le pareti a sbalzo. Se il valore è 90, nessuna parete sarà trattata" +" come parete a sbalzo. Nemmeno lo sbalzo supportato dal supporto sarà trattato come tale." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6227,17 @@ msgstr "Velocità dettagli piccole dimensioni" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Velocità layer iniziale per dettagli di piccole dimensioni" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 2e9b6dc49a..69cf78ac46 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -279,17 +279,17 @@ msgstr "印刷エラー" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF画像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "サポート対象外" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "キャンセル" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "ビジュアル" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "ビジュアルプロファイルは、優れたビジュアルと表面品質を目的としたビジュアルプロトタイプやモデルをプリントするために設計されています。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "エンジニアリングプロファイルは、精度向上と公差の厳格対応を目的とした機能プロトタイプや最終用途部品をプリントするために設計されています。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "ドラフト" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "ドラフトプロファイルは、プリント時間の大幅短縮を目的とした初期プロトタイプとコンセプト検証をプリントするために設計されています。" #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "プリンターを読み込み中…" #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "プレファレンスをセットアップ中..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2478,17 +2478,17 @@ msgstr "サポートとしてプリント" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2503,12 +2503,12 @@ msgstr "プロジェクトを開く" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2573,7 +2573,7 @@ msgstr "ネーム" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3173,12 @@ msgstr "レイヤービューコンパティビリティモードを強制する #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Curaを終了した場所で開くようにしますか？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "開始時にウィンドウの位置を復元" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3188,7 @@ msgstr "どのような種類のカメラレンダリングを使用する必要 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "無題" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3662,7 +3662,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4893,27 +4893,27 @@ msgstr "はじめに" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3Dビュー" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "フロントビュー" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "トップビュー" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "左ビュー" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "右ビュー" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5188,12 +5188,12 @@ msgstr "3.3から3.4にバージョンアップグレート" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 0ff33898af..40dab42b37 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -1076,12 +1076,12 @@ msgstr "最底面のレイヤー数。下の厚さで計算すると、この値 #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "初期底面レイヤー" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "ビルドプレートから上にある初期底面レイヤーの数。下の厚さで計算すると、この値は整数に変換されます。" #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -4107,7 +4107,7 @@ msgstr "最小サポートインターフェイス領域" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "サポートインターフェイスポリゴンの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4117,7 +4117,7 @@ msgstr "最小サポートルーフ領域" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "サポートのルーフの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4127,7 +4127,7 @@ msgstr "最小サポートフロア領域" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "サポートのフロアの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5660,22 +5660,22 @@ msgstr "各線分に導入されたランダム点間の平均距離。ポリゴ #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "流量補正時の最大抽出オフセット" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "流量の変化を補正するためにフィラメントを移動する最大距離（mm）。" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "流量補正要因" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "流量の変化を補正するためにフィラメントを移動する距離。フィラメントが1秒の押出で移動する距離の割合として指定します。" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5967,12 +5967,12 @@ msgstr "次のレイヤーの高さを前のレイヤーの高さと比べた差 #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "適応レイヤーのトポグラフィーサイズ" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "隣接する2つのレイヤー間の目標水平距離。この設定を小さくすると、レイヤーのエッジが近づくように薄いレイヤーが使用されます。" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5982,7 +5982,7 @@ msgstr "張り出し壁アングル" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "この角度以上に張り出した壁は、オーバーハング壁設定を使用してプリントされます。値が90の場合は、オーバーハング壁として処理されません。サポートによってサポートされているオーバーハングも、オーバーハングとして処理されません。" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6362,17 +6362,17 @@ msgstr "Small Feature Speed" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "小型形体の初期レイヤー速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 069944b9e2..1e8e4db07f 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -279,17 +279,17 @@ msgstr "프린트 오류" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF 이미지" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "지원되지 않음" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "취소" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "뛰어난 외관" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "시각적 프로파일은 높은 시각적 및 표면 품질의 의도를 지니고 시각적 프로토타입과 모델을 인쇄하기 위해 설계되었습니다." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "엔지니어링 프로파일은 정확도를 개선하고 허용 오차를 좁히려는 의도로 기능 프로토타입 및 최종 사용 부품을 인쇄하도록 설계되었습니다." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "초안" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "초안 프로파일은 인쇄 시간을 상당히 줄이려는 의도로 초기 프로토타입과 컨셉트 확인을 인쇄하도록 설계되었습니다." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "기기로드 중 ..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "환경 설정을 설정하는 중..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2477,17 +2477,17 @@ msgstr "서포터로 프린팅" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2502,12 +2502,12 @@ msgstr "프로젝트 열기" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2572,7 +2572,7 @@ msgstr "이름" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3168,12 +3168,12 @@ msgstr "레이어 뷰 호환성 모드로 전환 (다시 시작해야 함)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "닫힌 위치에서 Cura를 열어야 합니까?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "시작 시 창 위치 복원" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3183,7 +3183,7 @@ msgstr "어떤 유형의 카메라 렌더링을 사용해야 합니까?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3485,7 +3485,7 @@ msgstr "제목 없음" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3661,7 +3661,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4888,27 +4888,27 @@ msgstr "시작하기" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3D 보기" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "앞에서 보기" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "위에서 보기" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "왼쪽 보기" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "오른쪽 보기" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5183,12 +5183,12 @@ msgstr "버전 업그레이드 3.3에서 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 0694f2dc0b..6377245a76 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -1034,12 +1034,12 @@ msgstr "아래층의 수. 바닥 두께로 계산을 할때 이 값은 벽 두 #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "초기 하단 레이어" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "빌드 플레이트에서 위를 향하는 초기 하단 레이어 수. 하단 두께로 계산할 경우, 이 값이 전체 값으로 반올림됩니다." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3993,7 +3993,7 @@ msgstr "최소 서포트 인터페이스 지역" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "지원 인터페이스 다각형의 최소 영역 크기입니다. 이 값보다 작은 영역을 갖는 다각형은 정상적인 지원으로 인쇄됩니다." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4003,7 +4003,7 @@ msgstr "최소 서포트 지붕 지역" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "서포트 지붕에 대한 최소 면적 크기입니다. 이 값보다 작은 영역을 갖는 다각형은 정상적인 지원으로 인쇄됩니다." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4013,7 +4013,7 @@ msgstr "최소 서포트 바닥 지역" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "지원 바닥의 최소 면적 크기입니다. 이 값보다 작은 영역을 갖는 다각형은 정상적인 지원으로 인쇄됩니다." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5517,22 +5517,22 @@ msgstr "각 선분에 있는 임의의 점 사이의 평균 거리입니다. 다 #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "압출 속도 보상 최대 압출 오프셋" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "압출 속도를 보상하기 위해 필라멘트를 이동하는 최대 거리(mm)." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "압출 속도 보상 배율" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "압출 속도 변화를 보상하기 위해 필라멘트를 이동하는 거리(1초 압출 시 필라멘트가 이동할 수 있는 거리의 백분율)." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5824,12 +5824,12 @@ msgstr "이전 높이와 비교되는 다음 레이어 높이의 차이." #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "어댑티브 레이어 지형 크기" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "두 개의 인접 레이어 사이의 대상 수평 거리. 이러한 설정을 줄이면 레이어들의 가장자리를 더 가깝게 하도록 보다 얇은 레이어들을 사용하게 됩니다." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5839,7 +5839,7 @@ msgstr "오버행된 벽 각도" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "이 각도보다 놓은 오버행(경사면)의 벽은 오버행 벽 설정을 사용해 인쇄됩니다. 값이 90이면 오버행(경사면)으로 처리되는 벽이 없습니다. 서포트로 지지되는 오버행(경사면)도 오버행(경사면)으로 처리되지 않습니다." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6219,17 +6219,17 @@ msgstr "소형 피처 속도" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "소형 피처 초기 레이어 속도" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 2c2266855b..1f47d9de09 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -279,17 +279,17 @@ msgstr "Printfout" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF-afbeelding" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Niet ondersteund" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "Annuleren" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visueel" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Het visuele profiel is ontworpen om visuele prototypen en modellen te printen met als doel een hoge visuele en oppervlaktekwaliteit te creëren." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Het engineeringprofiel is ontworpen om functionele prototypen en onderdelen voor eindgebruik te printen met als doel een grotere precisie en nauwere toleranties." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Ontwerp" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Het ontwerpprofiel is ontworpen om initiële prototypen en conceptvalidatie te printen met als doel de printtijd aanzienlijk te verkorten." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "Machines laden..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Voorkeuren instellen..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2480,17 +2480,17 @@ msgstr "Printen als supportstructuur" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Project openen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2575,7 @@ msgstr "Naam" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3173,12 @@ msgstr "Compatibiliteitsmodus voor laagweergave forceren (opnieuw opstarten vere #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Moet Cura openen op de locatie waar het gesloten werd?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Herstel de vensterpositie bij het opstarten" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3188,7 @@ msgstr "Welk type cameraweergave moet worden gebruikt?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Zonder titel" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4902,27 +4902,27 @@ msgstr "Aan de slag" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3D-weergave" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Weergave voorzijde" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Weergave bovenzijde" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Linkeraanzicht" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Rechteraanzicht" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5197,12 +5197,12 @@ msgstr "Versie-upgrade van 3.3 naar 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index c4b7d04912..b371932564 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -1033,12 +1033,13 @@ msgstr "Het aantal bodemlagen. Wanneer deze waarde wordt berekend aan de hand va #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Eerste onderste lagen" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Het aantal initiële onderste lagen, vanaf de bouwplaat naar boven. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze" +" afgerond naar een geheel getal." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3993,7 @@ msgstr "Minimumgebied verbindingsstructuur" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimumgebied voor verbindingspolygonen. Polygonen met een gebied dat kleiner is dan deze waarde worden geprint als normale ondersteuning." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4003,7 @@ msgstr "Minimumgebied supportdak" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimumgebied voor de supportdaken. Polygonen met een gebied dat kleiner is dan deze waarde worden geprint als normale ondersteuning." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4013,7 @@ msgstr "Minimumgebied supportvloer" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimumgebied voor de supportvloeren. Polygonen met een gebied dat kleiner is dan deze waarde worden geprint als normale ondersteuning." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5517,23 @@ msgstr "De gemiddelde afstand tussen de willekeurig geplaatste punten op elk lij #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Maximale extrusieoffset voor doorvoercompensatie" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "De maximale afstand in mm om het filament te verplaatsen om veranderingen in de stroomsnelheid te compenseren." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Doorvoercompensatiefactor" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Hoe ver het filament moet worden verplaatst om veranderingen in de stroomsnelheid te compenseren, als een percentage van hoe ver het filament in één seconde" +" extrusie zou bewegen." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5827,13 @@ msgstr "Het hoogteverschil tussen de hoogte van de volgende laag ten opzichte va #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Topografieformaat aanpasbare lagen" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Horizontale doelafstand tussen twee aangrenzende lagen. Als u deze instelling verkleint, worden dunnere lagen gebruikt om de randen van de lagen dichter" +" bij elkaar te brengen." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5843,8 @@ msgstr "Hoek Overhangende Wand" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Wanden die overhangen in een hoek groter dan deze waarde, worden geprint met instellingen voor overhangende wanden. Wanneer de waarde 90 is, wordt een" +" wand niet als een overhangende wand gezien. Een overhang die wordt ondersteund door ondersteuning wordt ook niet als overhang gezien." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6224,17 @@ msgstr "Klein kenmerksnelheid" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Kleine kenmerken eerste laagsnelheid" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index c7ec507ebc..4f0d2ccc81 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -285,17 +285,17 @@ msgstr "Erro de impressão" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -499,7 +499,7 @@ msgstr "Imagem GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -741,7 +741,7 @@ msgstr "Não suportado" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -993,37 +993,40 @@ msgstr "Cancelar" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Acabamento" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "O perfil de acabamento foi criado para imprimir modelos e protótipos finais com o objetivo de se obter uma elevada qualidade de acabamento da superfície" +" em termos visuais." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "O perfil de engenharia foi criado para imprimir protótipos funcionais e peças finais com o objetivo de se obter uma maior precisão dimensional assim como" +" tolerâncias menores." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Rascunho" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "O perfil de rascunho foi concebido para imprimir protótipos de teste e de validação de conceitos com o objetivo de se obter uma redução significativa do" +" tempo de impressão." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1301,7 +1304,7 @@ msgstr "A carregar máquinas..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "A configurar as preferências..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2500,17 +2503,17 @@ msgstr "Imprimir como suporte" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2525,12 +2528,12 @@ msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2595,7 +2598,7 @@ msgstr "Nome" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3197,12 +3200,12 @@ msgstr "Forçar o modo de compatibilidade na visualização por camada (é neces #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "O Cura deve abrir na localização onde foi fechado?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Restaurar posição da janela ao iniciar" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3212,7 +3215,7 @@ msgstr "Que tipo de composição de câmara deve ser utilizado?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3516,7 +3519,7 @@ msgstr "Sem título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3709,7 +3712,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4955,27 +4958,27 @@ msgstr "Iniciar" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Vista 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Vista Frente" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Vista Cima" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Vista esquerda" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Vista direita" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5251,12 +5254,12 @@ msgstr "Atualização da versão 3.3 para 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 2054732139..c2418d1a61 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -1052,12 +1052,13 @@ msgstr "O número de camadas inferiores. Quando calculado através da Espessura #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Camadas inferiores iniciais" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "O número de camadas inferiores iniciais, a partir da base de construção no sentido ascendente. Quando calculado pela espessura inferior, este valor é arredondado" +" para um número inteiro." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -4119,7 +4120,7 @@ msgstr "Área mínima da interface de suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamanho mínimo da área para polígonos da interface do suporte. Os polígonos com uma área inferior a este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4129,7 +4130,7 @@ msgstr "Área mínima do teto de suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamanho mínimo da área para os tetos do suporte. Os polígonos com uma área inferior a este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4139,7 +4140,7 @@ msgstr "Área mínima do piso de suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Tamanho mínimo da área para os pisos do suporte. Os polígonos com uma área inferior a este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5688,22 +5689,23 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Desvio de extrusão máximo de compensação da taxa de fluxo" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "A distância máxima em mm de deslocação do filamento para compensar alterações na taxa de fluxo." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Fator de compensação da taxa de fluxo" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Até que distância o filamento se deve mover para compensar as alterações na taxa de fluxo, como uma percentagem da distância que o filamento iria percorrer" +" num segundo de extrusão." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5997,12 +5999,13 @@ msgstr "A diferença de espessura da camada seguinte em comparação com a anter #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Dimensão da topografia das camadas adaptáveis" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Distância horizontal pretendida entre duas camadas adjacentes. Reduzir o valor desta definição faz com que camadas mais finas sejam utilizadas para juntar" +" mais os contornos das camadas." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -6012,7 +6015,8 @@ msgstr "Ângulo da parede de saliências" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "As paredes com saliências que ultrapassem este ângulo serão impressas utilizando definições de parede de saliências. Quando o valor é 90, nenhuma parede" +" é considerada como sendo uma saliência. As saliências suportadas por suporte também não serão consideradas como saliências." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6392,17 +6396,17 @@ msgstr "Velocidade de elemento pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Velocidade da camada inicial de partes pequenas" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 56dbe7fe95..b1aa3eb8fb 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -279,17 +279,17 @@ msgstr "Ошибка печати" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF изображение" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Не поддерживается" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "Отмена" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Визуальный" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Визуальный профиль предназначен для печати визуальных прототипов и моделей, для которых требуется высокое качество поверхности и внешнего вида." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Инженерный профиль предназначен для печати функциональных прототипов и готовых деталей, для которых требуется высокая точность и малые допуски." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Черновой" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Черновой профиль предназначен для печати начальных прототипов и проверки концепции, где приоритетом является скорость печати." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "Загрузка принтеров..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Настройка параметров..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2481,17 +2481,17 @@ msgstr "Печать в качестве поддержки" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2506,12 +2506,12 @@ msgstr "Открытие проекта" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2576,7 +2576,7 @@ msgstr "Название" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3176,12 +3176,12 @@ msgstr "Просматривать слои в режиме совместимо #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Открыть Cura на том месте, где вы остановились в прошлый раз?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Восстановить положение окна при запуске" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3191,7 +3191,7 @@ msgstr "Рендеринг камеры какого типа следует и #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3493,7 +3493,7 @@ msgstr "Без имени" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3671,7 +3671,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4912,27 +4912,27 @@ msgstr "Приступить" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Трехмерный вид" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Вид спереди" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Вид сверху" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Вид слева" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Вид справа" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5207,12 +5207,12 @@ msgstr "Обновление версии 3.3 до 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index aee05e82f7..6dc5284211 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -1034,12 +1034,12 @@ msgstr "Количество слоёв в дне. При вычислении #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Начальные слои дна" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Количество начальных слоев дна, вверх от рабочего стола. При вычислении толщины дна это значение округляется до целого." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3993,7 +3993,7 @@ msgstr "Минимальная зона связующего слоя" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Минимальная площадь зоны для полигонов связующего слоя. Полигоны с площадью меньше данного значения будут печататься как поддержки нормали." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4003,7 +4003,7 @@ msgstr "Минимальная зона верхней части поддерж #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Минимальная площадь зоны для верхних частей поддержек. Полигоны с площадью меньше данного значения будут печататься как поддержки нормали." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4013,7 +4013,7 @@ msgstr "Минимальная зона нижней части поддерже #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Минимальная площадь зоны для нижних частей поддержек. Полигоны с площадью меньше данного значения будут печататься как поддержки нормали." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5517,22 +5517,23 @@ msgstr "Среднее расстояние между случайными то #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Макс. смещение экструзии для компенсации расхода" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "Максимальное расстояние (в мм) перемещения материала для компенсации изменения расхода." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Коэффициент компенсации расхода" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Означает, насколько далеко следует переместить материал, чтобы компенсировать изменение расхода, в процентах от расстояния, на которое перемещается материал" +" за одну секунду экструзии." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5826,12 +5827,13 @@ msgstr "Разница между высотой следующего слоя #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Размер топографии адаптивных слоев" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Целевое расстояние по горизонтали между двумя соседними слоями. Уменьшение этого значения приведет к сокращению толщины слоев, и края слоев станут ближе" +" друг к другу." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5841,7 +5843,8 @@ msgstr "Угол нависающей стенки" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Стенки, выступающие под углом больше указанного, будут напечатаны с использованием настроек выступающей стенки. Если значение составляет 90, стенки не" +" считаются выступающими. Выступающие элементы, для которых имеется поддержка, также не считаются выступающими." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6221,17 +6224,17 @@ msgstr "Скорость для малых элементов" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Скорость первого слоя для небольших объектов" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index c837538e0f..07810ddae1 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -279,17 +279,17 @@ msgstr "Baskı hatası" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF Resmi" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Desteklenmiyor" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "İptal Et" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Görsel" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Görsel profili, yüksek görsel ve yüzey kalitesi oluşturmak amacıyla, görsel prototipler ve modeller basılması için tasarlanmıştır." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Mühendislik profili, daha yüksek doğruluk ve daha yakın toleranslar sağlamak amacıyla, işlevsel prototipler ve son kullanım parçaları basılması için tasarlanmıştır." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Taslak" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Taslak profili, baskı süresinin önemli ölçüde kısaltılması amacıyla, birincil prototipler basılması ve konsept doğrulaması yapılması için tasarlanmıştır." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "Makineler yükleniyor..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Tercihler ayarlanıyor..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2480,17 +2480,17 @@ msgstr "Destek olarak yazdır" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Proje Aç" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2575,7 @@ msgstr "İsim" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3173,12 @@ msgstr "Katman görünümünü uyumluluk moduna zorla (yeniden başlatma gerekir #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Cura kapatıldığı yerden mi başlatılsın?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Başlangıçtaki pencere konumuna dönülsün" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3188,7 @@ msgstr "Ne tür bir kamera oluşturma işlemi kullanılmalıdır?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Başlıksız" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4902,27 +4902,27 @@ msgstr "Başlayın" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3 Boyutlu Görünüm" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Önden Görünüm" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Yukarıdan Görünüm" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Sol görünüm" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Sağ görünüm" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5197,12 +5197,12 @@ msgstr "3.3'dan 3.4'e Sürüm Yükseltme" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 2ff23f5b65..20f91722f1 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -1033,12 +1033,12 @@ msgstr "Alt katman sayısı. Bu değer, alt kalınlığıyla hesaplandığında #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "İlk Alt Katmanlar" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Yapı plakasından itibaren ilk alt katman sayısı Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3992,7 @@ msgstr "Minimum Destek Arayüzü Bölgesi" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Destek arayüzü çokgenlerinin minimum alan boyutu. Alanı bu değerden küçük olan poligonlar normal destekle basılacaktır." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4002,7 @@ msgstr "Minimum Destek Çatısı Bölgesi" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Destek çatılarının minimum alan boyutu. Alanı bu değerden küçük olan poligonlar normal destekle basılacaktır." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4012,7 @@ msgstr "Minimum Destek Zemini Bölgesi" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Destek tabanlarının minimum alan boyutu. Alanı bu değerden küçük olan poligonlar normal destekle basılacaktır." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5516,23 @@ msgstr "Her bir hat dilimine tanıtılan rastgele noktalar arasındaki ortalama #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Akış hızı dengelemesi maksimum ekstrüzyon kayması" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "Akış hızındaki değişiklikleri telafi etmek için filamentin hareket ettirileceği mm cinsinden maksimum mesafe." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Akış hızı dengeleme çarpanı" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Akış hızındaki değişiklikleri telafi edebilmek için filamentin bir saniyelik ekstrüzyonda hareket ettirileceği mesafenin yüzdesi olarak filamentin ne kadar" +" uzağa hareket ettirileceği." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5826,13 @@ msgstr "Bir önceki ve bir sonraki katman yüksekliği arasındaki yükseklik fa #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Uyarlanabilir Katman Topografisi Boyutu" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "İki bitişik katman arasındaki hedef yatay mesafe. Bu ayarın azaltılması, katmanların kenarlarını birbirine yakınlaştırmak için daha ince katmanlar kullanılmasına" +" neden olur." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5842,8 @@ msgstr "Çıkıntılı Duvar Açısı" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Bu açıdan daha yüksek çıkıntıya sahip duvarlar çıkıntılı duvar ayarları kullanılarak basılacaktır. Değer 90 ise hiçbir duvarda çıkıntı olmadığı varsayılacaktır." +" Destek ile desteklenen çıkıntılar da çıkıntı olarak değerlendirilmeyecektir." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6223,17 @@ msgstr "Küçük Özellik Hızı" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Küçük Özellik İlk Katman Hızı" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index bee70f1660..6291113925 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -279,17 +279,17 @@ msgstr "打印错误" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "New cloud printers found" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Do not show this message again" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF 图像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "不支持" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "取消" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "视觉" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "视觉配置文件用于打印视觉原型和模型，可实现出色的视觉效果和表面质量。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engineering" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "工程配置文件用于打印功能性原型和最终用途部件，可提高准确性和减小公差。" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "草稿" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "草稿配置文件用于打印初始原型和概念验证，可大大缩短打印时间。" #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "正在载入打印机..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "正在设置偏好设置..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2479,17 +2479,17 @@ msgstr "打印为支撑" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modify settings for overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Don't support overlaps" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Infill only" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2504,12 +2504,12 @@ msgstr "打开项目" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Update existing" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Create new" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2574,7 +2574,7 @@ msgstr "名字" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Intent" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3170,12 +3170,12 @@ msgstr "强制层视图兼容模式（需要重新启动）" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Cura 是否应该在关闭的位置打开？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "恢复初始窗口位置" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3185,7 +3185,7 @@ msgstr "应使用哪种类型的摄像头进行渲染？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Camera rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3487,7 +3487,7 @@ msgstr "未命名" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Search settings" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3663,7 +3663,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Custom profiles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4892,27 +4892,27 @@ msgstr "开始" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "3D 视图" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "正视图" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "顶视图" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "左视图" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "右视图" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5187,12 +5187,12 @@ msgstr "版本升级3.3到3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Version Upgrade 4.3 to 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index e9e119ade0..ca718e36db 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -1034,12 +1034,12 @@ msgstr "底层的数量。 在按底层厚度计算时，该值舍入为整数 #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "初始底层数" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "从构建板向上算起的初始底层数。在按底层厚度计算时，该值四舍五入为整数。" #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3993,7 +3993,7 @@ msgstr "最小支撑接触面面积" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撑接触面多边形的最小面积。面积小于此值的多边形将打印为一般支撑。" #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4003,7 +4003,7 @@ msgstr "最小支撑顶板面积" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撑顶板的最小面积。面积小于此值的多边形将打印为一般支撑。" #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4013,7 +4013,7 @@ msgstr "最小支撑底板面积" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "支撑底板的最小面积。面积小于此值的多边形将打印为一般支撑。" #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5517,22 +5517,22 @@ msgstr "在每个走线部分引入的随机点之间的平均距离。 注意 #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "流量补偿最大挤出偏移值" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "移动线材以补偿流量变化的最大距离（以毫米为单位）。" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "流量补偿因子" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "为补偿流量变化而将线材移动的距离，在挤出一秒钟的情况下占线材移动距离的百分比。" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5826,12 +5826,12 @@ msgstr "下一层与前一层的高度差。" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "自适应图层地形尺寸" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "两个相邻图层之间的目标水平距离。减小此设置的值会使要使用的图层变薄，从而使图层的边缘距离更近。" #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5841,7 +5841,7 @@ msgstr "悬垂壁角度" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "悬垂超过此角度的壁将使用悬垂壁设置打印。该值为 90 时，不会将任何壁视为悬垂。受到支撑支持的悬垂也不会被视为悬垂。" #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6221,17 +6221,17 @@ msgstr "微小特征速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "微小特征初始层速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." #: fdmprinter.def.json msgctxt "command_line_settings label" From 22fe13890eb950dce8e82ac9d8cd98f28cb848f1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 14 Nov 2019 18:26:46 +0100 Subject: [PATCH 942/994] Make sure translations are loaded before init. Intents. part of CURA-6957 --- cura/Machines/Models/IntentCategoryModel.py | 41 ++++++++++++--------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index cb81aec3c7..48889b1144 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -29,24 +29,29 @@ class IntentCategoryModel(ListModel): modelUpdated = pyqtSignal() + _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]]" + # Translations to user-visible string. Ordered by weight. # TODO: Create a solution for this name and weight to be used dynamically. - _translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]]" - _translations["default"] = { - "name": catalog.i18nc("@label", "Default") - } - _translations["visual"] = { - "name": catalog.i18nc("@label", "Visual"), - "description": catalog.i18nc("@text", "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality.") - } - _translations["engineering"] = { - "name": catalog.i18nc("@label", "Engineering"), - "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances.") - } - _translations["quick"] = { - "name": catalog.i18nc("@label", "Draft"), - "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") - } + @classmethod + def _get_translations(cls): + if len(cls._translations) == 0: + cls._translations["default"] = { + "name": catalog.i18nc("@label", "Default") + } + cls._translations["visual"] = { + "name": catalog.i18nc("@label", "Visual"), + "description": catalog.i18nc("@text", "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality.") + } + cls._translations["engineering"] = { + "name": catalog.i18nc("@label", "Engineering"), + "description": catalog.i18nc("@text", "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances.") + } + cls._translations["quick"] = { + "name": catalog.i18nc("@label", "Draft"), + "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") + } + return cls._translations ## Creates a new model for a certain intent category. @@ -99,7 +104,7 @@ class IntentCategoryModel(ListModel): "name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")), "description": IntentCategoryModel.translation(category, "description", None), "intent_category": category, - "weight": list(self._translations.keys()).index(category), + "weight": list(IntentCategoryModel._get_translations().keys()).index(category), "qualities": qualities }) result.sort(key = lambda k: k["weight"]) @@ -109,5 +114,5 @@ class IntentCategoryModel(ListModel): ## for categories and keys @staticmethod def translation(category: str, key: str, default: Optional[str] = None): - display_strings = IntentCategoryModel._translations.get(category, {}) + display_strings = IntentCategoryModel._get_translations().get(category, {}) return display_strings.get(key, default) From 08ca21312750441011ceb876e2714c774b3ca3ea Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 15 Nov 2019 11:35:06 +0100 Subject: [PATCH 943/994] Add extra update for Combobox --- resources/qml/MachineSettings/ComboBoxWithOptions.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index fbb05c23b1..715a6e9224 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -91,6 +91,7 @@ UM.TooltipArea { target: propertyProvider onContainerStackChanged: defaultOptionsModel.updateModel() + onIsValueUsedChanged: defaultOptionsModel.updateModel() } Cura.ComboBox From a6203f462d584475d459f775ebf60bcaadfaa72a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 15 Nov 2019 15:00:44 +0100 Subject: [PATCH 944/994] Add build_type into crash reports and stats CURA-6981 --- cura/CrashHandler.py | 4 ++++ plugins/SliceInfoPlugin/SliceInfo.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index 1d85a1da54..1ec00787d7 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -25,6 +25,8 @@ from UM.View.GL.OpenGL import OpenGL from UM.i18n import i18nCatalog from UM.Resources import Resources +from cura import ApplicationMetadata + catalog = i18nCatalog("cura") MYPY = False @@ -181,6 +183,7 @@ class CrashHandler: self.cura_version = catalog.i18nc("@label unknown version of Cura", "Unknown") crash_info = "" + catalog.i18nc("@label Cura version number", "Cura version") + ": " + str(self.cura_version) + "
" + crash_info += "" + catalog.i18nc("@label Cura build type", "Cura build type") + ": " + str(ApplicationMetadata.CuraBuildType) + "
" crash_info += "" + catalog.i18nc("@label Type of platform", "Platform") + ": " + str(platform.platform()) + "
" crash_info += "" + catalog.i18nc("@label", "Qt version") + ": " + str(QT_VERSION_STR) + "
" crash_info += "" + catalog.i18nc("@label", "PyQt version") + ": " + str(PYQT_VERSION_STR) + "
" @@ -191,6 +194,7 @@ class CrashHandler: group.setLayout(layout) self.data["cura_version"] = self.cura_version + self.data["cura_build_type"] = ApplicationMetadata.CuraBuildType self.data["os"] = {"type": platform.system(), "version": platform.version()} self.data["qt_version"] = QT_VERSION_STR self.data["pyqt_version"] = PYQT_VERSION_STR diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index acab445fd6..af8a8b9853 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -18,6 +18,8 @@ from UM.Logger import Logger from UM.PluginRegistry import PluginRegistry from UM.Qt.Duration import DurationFormat +from cura import ApplicationMetadata + from .SliceInfoJob import SliceInfoJob @@ -119,6 +121,7 @@ class SliceInfo(QObject, Extension): data["time_stamp"] = time.time() data["schema_version"] = 0 data["cura_version"] = application.getVersion() + data["cura_build_type"] = ApplicationMetadata.CuraBuildType active_mode = Application.getInstance().getPreferences().getValue("cura/active_mode") if active_mode == 0: From 3f90566edc0585652ee94480fca88df49049ef39 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 15 Nov 2019 17:04:53 +0100 Subject: [PATCH 945/994] Added Polish translation by one of our volunteer translators. part of CURA-6957 --- resources/i18n/pl_PL/cura.po | 74 ++++++++++---------- resources/i18n/pl_PL/fdmextruder.def.json.po | 2 +- resources/i18n/pl_PL/fdmprinter.def.json.po | 36 +++++----- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index bbdeb8109b..27f6acbe12 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Project-Id-Version: Cura 4.3\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" -"PO-Revision-Date: 2019-09-24 17:00+0200\n" +"PO-Revision-Date: 2019-11-15 15:23+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" "Language: pl_PL\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.2.4\n" "X-Poedit-SourceCharset: UTF-8\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 @@ -280,17 +280,17 @@ msgstr "Błąd druku" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "Znaleziono nowe drukarki w chmurze" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "Nowe drukarki podłączone do Twojego konta zostały znalezione, można je odszukać na liście wykrytych drukarek." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Nie pokazuj tego komunikatu ponownie" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -494,7 +494,7 @@ msgstr "Obraz GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Otwórz skompresowaną siatkę trójkątów" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -736,7 +736,7 @@ msgstr "Niewspierany" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Domyślne" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -988,37 +988,37 @@ msgstr "Anuluj" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Domyślne" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Wizualny" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "Profil wizualny jest przeznaczony do drukowania prototypów i modeli z zamiarem podkreślenia wysokiej jakości wizualnej i powierzchni." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Inżynieria" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "Profil inżynieryjny jest przeznaczony do drukowania prototypów funkcjonalnych i części końcowych z naciskiem na lepszą dokładność i lepszą tolerancję." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Szkic" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "Profil szkicu służy do drukowania początkowych prototypów i weryfikacji koncepcji z naciskiem na krótki czasu drukowania." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1289,7 +1289,7 @@ msgstr "Ładowanie drukarek..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Ustawianie preferencji..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2481,17 +2481,17 @@ msgstr "Drukuj jako podpora" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modyfikuj ustawienia nakładania" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Nie wspieraj nałożenia" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Tylko wypełnienie" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2506,12 +2506,12 @@ msgstr "Otwórz projekt" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Zaktualizuj istniejące" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Utwórz nowy" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2576,7 +2576,7 @@ msgstr "Nazwa" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Cel" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3174,12 +3174,12 @@ msgstr "Wymuszenie widoku warstw w trybie zgodności (wymaga ponownego uruchomie #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "Czy Cura powinna się otwierać w miejscu, w którym została zamknięta?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Przywróć pozycję okna przy starcie" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3189,7 +3189,7 @@ msgstr "Jakiego rodzaju kamery należy użyć do renderowania?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Renderowanie z kamery: " #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3491,7 +3491,7 @@ msgstr "Bez tytułu" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Ustawienia wyszukiwania" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3586,8 +3586,8 @@ msgstr "" msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nie ma profilu %1 dla konfiguracji w ekstruderze %2. Zamiast tego zostaną użyte domyślne cale" +msgstr[1] "Nie ma profilu %1 dla konfiguracji w ekstruderach %2. Zamiast tego zostaną użyte domyślne cale" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" @@ -3668,7 +3668,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Profile niestandardowe" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4903,27 +4903,27 @@ msgstr "Rozpocznij" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Widok 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Widok z przodu" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Widok z góry" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Widok z lewej strony" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Widok z prawej strony" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5198,12 +5198,12 @@ msgstr "Ulepszenie Wersji z 3.3 do 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Uaktualnia konfiguracje z Cura 4.3 to Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Uaktualnij wersję 4.3 do 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 4bd0384ad6..3983ca9326 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" +"Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 6dabf74c37..b6ebd6474a 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.4\n" +"Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" -"PO-Revision-Date: 2019-09-30 15:45+0200\n" +"PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" "Language: pl_PL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1033,12 +1033,12 @@ msgstr "Liczba dolnych warstw. Przy obliczaniu grubości dołu ta wartość jest #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Początkowej warstwy dolne" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "Liczba początkowych dolnych warstw, od stołu w górę. Obliczona na podstawie grubości spodu, wartość ta jest zaokrąglana do liczby całkowitej." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3992,7 +3992,7 @@ msgstr "Minimalna Powierzchnia Interfejsu Podpór" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimalny rozmiar obszaru dla wielokątów interfejsu podpór. Wielokąty, których powierzchnia jest mniejsza niż ta wartość, zostaną wydrukowane jako normalne podpory." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4002,7 +4002,7 @@ msgstr "Minimalna Powierzchnia Dachu Podpór" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimalny rozmiar obszaru dla dachu podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, zostaną wydrukowane jako normalne podpory." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4012,7 +4012,7 @@ msgstr "Minimalna Powierzchnia Podłoża Podpór" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Minimalny rozmiar obszaru dla podłoża podpór. Obszary, które mają powierzchnię mniejszą od tej wartości, zostaną wydrukowane jako normalne podpory." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5516,22 +5516,22 @@ msgstr "Średnia odległość między losowymi punktami wprowadzonymi w każdym #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Maksymalna kompensowania przepływu" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "Maksymalna odległość w mm do przesuwania filamentu w celu kompensacji zmian wielkości przepływu." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Współczynnik kompensacji przepływu" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Jak bardzo przesunąć filament, aby skompensować zmiany wielkości przepływu, jako procent odległości, o jaką filament poruszyłby się w ciągu jednej sekundy wytłaczania." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,12 +5825,12 @@ msgstr "Różnica w wysokości pomiędzy następną wysokością warstwy i poprz #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Rozmiar topografii warstw adaptacyjnych" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Docelowa odległość pozioma między dwiema sąsiadującymi warstwami. Zmniejszenie tego ustawienia powoduje użycie cieńszych warstw w celu przybliżenia krawędzi warstw." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,7 +5840,7 @@ msgstr "Kąt Nawisającej Ścianki" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Ściany, które wystają więcej niż zadany kont, zostaną wydrukowane przy użyciu ustawień wystających ścian. Gdy wartość wynosi 90, żadne ściany nie będą traktowane jako wystające. Zwis, który jest obsługiwany przez podpory, nie będzie również traktowany jako zwis." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,17 +6220,17 @@ msgstr "Prędkość małych elementów" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Małe obiekty zostaną wydrukowane z zadanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może poprawić przyczepność i dokładność." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Prędkość początkowej warstwy małych obiektów" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Pierwsza warstwa małych obiektów zostanie wydrukowana z zadanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może poprawić przyczepność i dokładność." #: fdmprinter.def.json msgctxt "command_line_settings label" From 589429293555a6e489f7c98ed60fcd717afed6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Sat, 16 Nov 2019 13:09:49 -0300 Subject: [PATCH 946/994] Updated pt_BR strings for 4.4 --- resources/i18n/pt_BR/cura.po | 1223 ++++++++++-------- resources/i18n/pt_BR/fdmextruder.def.json.po | 8 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 198 ++- 3 files changed, 806 insertions(+), 623 deletions(-) diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 1a9ca5fc90..b5f81cfbf2 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0200\n" -"PO-Revision-Date: 2019-09-17 06:50-0300\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"POT-Creation-Date: 2019-11-05 13:13+0100\n" +"PO-Revision-Date: 2019-11-15 16:30-0300\n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.2.3\n" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:30 msgctxt "@action" msgid "Machine Settings" msgstr "Ajustes da Máquina" @@ -40,13 +40,13 @@ msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Arquivo G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:67 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:66 msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo binário." -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 -#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:72 +#: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:88 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Por favor prepare o G-Code antes de exportar." @@ -56,7 +56,7 @@ msgctxt "@info:title" msgid "3D Model Assistant" msgstr "Assistente de Modelo 3D" -#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:90 +#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:92 #, python-brace-format msgctxt "@info:status" msgid "" @@ -75,16 +75,6 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar Firmware" -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 -msgctxt "@item:inmenu" -msgid "Flatten active settings" -msgstr "Achatar os ajustes ativos" - -#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:35 -msgctxt "@info:status" -msgid "Profile has been flattened & activated." -msgstr "O perfil foi achatado & ativado." - #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" @@ -125,21 +115,6 @@ msgctxt "@message" msgid "Print in Progress" msgstr "Impressão em Progresso" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 -msgctxt "X3g Writer Plugin Description" -msgid "Writes X3g to files" -msgstr "Grava em formato X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:21 -msgctxt "X3g Writer File Description" -msgid "X3g File" -msgstr "Arquivo X3g" - -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Arquivo X3G" - #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -211,9 +186,9 @@ msgid "Could not save to removable drive {0}: {1}" msgstr "Não foi possível salvar em unidade removível {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1634 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1668 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -243,8 +218,8 @@ msgstr "Ejetar dispositivo removível {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:201 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1624 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1724 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1658 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1758 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -276,17 +251,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:52 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:57 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:53 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:58 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprime pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:54 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:59 msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado pela rede" @@ -301,6 +276,21 @@ msgctxt "@info:title" msgid "Print error" msgstr "Erro de impressão" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 +msgctxt "@info:title" +msgid "New cloud printers found" +msgstr "Novas impressoras de nuvem encontradas" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 +msgctxt "@info:message" +msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Novas impressoras foram encontradas conectadas à sua conta; você as pode ver na sua lista de impressoras descobertas." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 +msgctxt "@info:option_text" +msgid "Do not show this message again" +msgstr "Não mostrar essa mensagem novamente" + #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" @@ -501,9 +491,9 @@ msgid "GIF Image" msgstr "Imagem GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 -msgctxt "@item:inlistbox" +msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Malha Comprimida de Triângulos Aberta" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -594,12 +584,12 @@ msgctxt "@info:tooltip" msgid "Configure Per Model Settings" msgstr "Configurar ajustes por Modelo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:186 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:188 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -610,19 +600,19 @@ msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Arquivo 3MF" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:774 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:198 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:651 msgctxt "@label" msgid "Nozzle" msgstr "Bico" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:479 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:496 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O arquivo de projeto {0} contém um tipo de máquina desconhecido {1}. Não foi possível importar a máquina. Os modelos serão importados ao invés dela." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:482 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:499 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir Arquivo de Projeto" @@ -702,16 +692,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:18 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -732,7 +712,6 @@ msgctxt "@item:inmenu" msgid "Preview" msgstr "Pré-visualização" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelection.py:19 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelection.py:18 msgctxt "@action" msgid "Select upgrades" @@ -748,134 +727,148 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Login falhou" -#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:33 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" msgid "Not supported" msgstr "Não Suportado" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 +#: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 +msgctxt "@info:No intent profile selected" +msgid "Default" +msgstr "Default" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:124 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:197 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:126 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O arquivo {0} já existe. Tem certeza que quer sobrescrevê-lo?" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:427 #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:430 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:433 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:780 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Os ajustes foram alterados para seguir a disponibilidade de extrusores atuais:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:782 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes atualizados" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1483 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1334 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:135 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1457 +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:99 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +msgctxt "@label" +msgid "Unknown" +msgstr "Desconhecido" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:137 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Falha ao exportar perfil para {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:142 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Falha ao exportar perfil para {0}: complemento escritor relatou erro." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:147 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:149 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado para {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:148 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:150 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportação concluída" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:175 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Falha ao importar perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:179 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:181 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Não foi possível importar perfil de {0} antes de uma impressora ser adicionada." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:195 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:198 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Não há perfil personalizado a importar no arquivo {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:199 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:202 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:223 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:233 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:226 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:236 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Este perfil {0} contém dados incorretos, não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:325 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:328 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado com sucesso" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:323 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:331 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Arquivo {0} não contém nenhum perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:326 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:334 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O Perfil {0} tem tipo de arquivo desconhecido ou está corrompido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:361 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:377 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:385 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Falta um tipo de qualidade ao Perfil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:392 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:399 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -941,14 +934,13 @@ msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:306 +#: /home/ruben/Projects/Cura/cura/UI/PrintInformation.py:302 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Arquivo pré-fatiado {0}" #: /home/ruben/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:62 msgctxt "@action:button" msgid "Next" msgstr "Próximo" @@ -962,9 +954,9 @@ msgstr "Grupo #{group_nr}" #: /home/ruben/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:133 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:169 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -979,40 +971,85 @@ msgstr "Adicionar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:355 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:406 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:294 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:36 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 +msgctxt "@label" +msgid "Default" +msgstr "Default" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 +msgctxt "@label" +msgid "Visual" +msgstr "Visual" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 +msgctxt "@text" +msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." +msgstr "O perfil visual é projetado para imprimir protótipos e modelos virtuais com o objetivo de alta qualidade visual e de superfície." + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 +msgctxt "@label" +msgid "Engineering" +msgstr "Engenharia" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 +msgctxt "@text" +msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." +msgstr "O perfil de engenharia é projetado para imprimir protótipos funcionais e partes de uso final com o objetivo de melhor precisão e tolerâncias mais estritas." + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 +msgctxt "@label" +msgid "Draft" +msgstr "Rascunho" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 +msgctxt "@text" +msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." +msgstr "O perfil de rascunho é projetado para imprimir protótipos iniciais e validações de conceito com o objetivo de redução significativa de tempo de impressão." + #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" msgid "Not overridden" msgstr "Não sobreposto" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:357 +msgctxt "@label" +msgid "Custom profiles" +msgstr "Perfis personalizados" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:391 #, python-brace-format msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" msgstr "Todos Os Tipos Suportados ({0})" -#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:110 +#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:392 msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos Os Arquivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:213 msgctxt "@label" -msgid "Unknown" -msgstr "Desconhecido" +msgid "Custom Material" +msgstr "Material Personalizado" + +#: /home/ruben/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:214 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +msgctxt "@label" +msgid "Custom" +msgstr "Personalizado" #: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" @@ -1024,17 +1061,6 @@ msgctxt "@label" msgid "Available networked printers" msgstr "Impressoras de rede disponíveis" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:689 -msgctxt "@label" -msgid "Custom Material" -msgstr "Material Personalizado" - -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:690 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:203 -msgctxt "@label" -msgid "Custom" -msgstr "Personalizado" - #: /home/ruben/Projects/Cura/cura/BuildVolume.py:90 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -1070,11 +1096,6 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não foi possível contactar o servidor de contas da Ultimaker." -#: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:202 -msgctxt "@action:button" -msgid "Retry" -msgstr "Tentar novamente" - #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationRequestHandler.py:70 msgctxt "@message" msgid "Please give the required permissions when authorizing this application." @@ -1259,62 +1280,67 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:505 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:513 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Carregando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:820 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 +msgctxt "@info:progress" +msgid "Setting up preferences..." +msgstr "Ajustando preferências..." + +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando cena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:855 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:859 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Carregando interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1134 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1150 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1623 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1657 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1633 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1667 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1723 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1757 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado é pequenos demais para carregar." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:58 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:56 msgctxt "@title:label" msgid "Printer Settings" msgstr "Ajustes de Impressora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 msgctxt "@label" msgid "X (Width)" msgstr "X (largura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:206 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:244 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:203 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:223 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:243 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:284 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:285 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 @@ -1323,57 +1349,57 @@ msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profundidade)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 msgctxt "@label" msgid "Build plate shape" msgstr "Forma da plataforma de impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 msgctxt "@label" msgid "Origin at center" msgstr "Origem no centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 msgctxt "@label" msgid "Heated bed" msgstr "Mesa aquecida" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 msgctxt "@label" msgid "Heated build volume" msgstr "Volume de construção aquecido" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:161 msgctxt "@label" msgid "G-code flavor" msgstr "Sabor de G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:188 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:185 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ajustes da Cabeça de Impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:202 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:199 msgctxt "@label" msgid "X min" msgstr "X mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:219 msgctxt "@label" msgid "Y min" msgstr "Y mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:240 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:239 msgctxt "@label" msgid "X max" msgstr "X máx." @@ -1383,22 +1409,22 @@ msgctxt "@label" msgid "Y max" msgstr "Y máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:280 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:281 msgctxt "@label" msgid "Gantry Height" msgstr "Altura do Eixo" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:294 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:295 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:353 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code Inicial" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:367 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:366 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code Final" @@ -1477,7 +1503,7 @@ msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:77 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" @@ -1672,11 +1698,6 @@ msgctxt "@label:table_header" msgid "Machine" msgstr "Máquina" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 -msgctxt "@label:table_header" -msgid "Print Core" -msgstr "Núcleo de Impressão" - #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" @@ -1932,9 +1953,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:155 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Remover" @@ -1955,61 +1976,61 @@ msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:228 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:274 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:290 msgctxt "@label" msgid "Address" msgstr "Endereço" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:266 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:263 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:270 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:267 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impressora é a hospedeira de um grupo de %1 impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:281 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:278 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "A impressora neste endereço ainda não respondeu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:286 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@action:button" msgid "Connect" msgstr "Conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:299 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:296 msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:300 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Por favor entre um endereço IP válido." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:311 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:308 msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:334 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Entre o endereço IP da sua impressora na rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" @@ -2064,17 +2085,17 @@ msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina %1 em %2" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 -msgctxt "@action:button" -msgid "Print" -msgstr "Imprimir" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:11 msgctxt "@title:window" msgid "Print over network" msgstr "Imprimir pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:52 +msgctxt "@action:button" +msgid "Print" +msgstr "Imprimir" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:80 msgctxt "@label" msgid "Printer selection" msgstr "Seleção de impressora" @@ -2425,72 +2446,71 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavização" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:37 -msgctxt "@label" -msgid "Mesh Type" -msgstr "Tipo de Malha" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:68 -msgctxt "@label" -msgid "Normal model" -msgstr "Modelo normal" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:75 -msgctxt "@label" -msgid "Print as support" -msgstr "Imprimir como suporte" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:83 -msgctxt "@label" -msgid "Don't support overlap with other models" -msgstr "Não suportar sobreposição com outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:91 -msgctxt "@label" -msgid "Modify settings for overlap with other models" -msgstr "Modificar ajustes para sobrepor com outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:99 -msgctxt "@label" -msgid "Modify settings for infill of other models" -msgstr "Modificar ajustes para preenchimento de outros modelos" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:346 -msgctxt "@action:button" -msgid "Select settings" -msgstr "Selecionar ajustes" - -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:388 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:13 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:56 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:70 msgctxt "@label:checkbox" msgid "Show all" msgstr "Exibir tudo" +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:44 +msgctxt "@label" +msgid "Mesh Type" +msgstr "Tipo de Malha" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:85 +msgctxt "@label" +msgid "Normal model" +msgstr "Modelo normal" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:97 +msgctxt "@label" +msgid "Print as support" +msgstr "Imprimir como suporte" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 +msgctxt "@label" +msgid "Modify settings for overlaps" +msgstr "Modificar ajustes para sobreposições" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 +msgctxt "@label" +msgid "Don't support overlaps" +msgstr "Não suportar sobreposições" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 +msgctxt "@action:checkbox" +msgid "Infill only" +msgstr "Preenchimento apenas" + +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 +msgctxt "@action:button" +msgid "Select settings" +msgstr "Selecionar ajustes" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Atualizar existente" +msgstr "Atualizar existentes" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 -msgctxt "@action:ComboBox option" +msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Criar novo" +msgstr "Criar novos" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2515,6 +2535,11 @@ msgctxt "@action:ComboBox option" msgid "Update" msgstr "Atualizar" +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:116 +msgctxt "@action:ComboBox option" +msgid "Create new" +msgstr "Criar novo" + #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:106 msgctxt "@action:label" @@ -2528,7 +2553,7 @@ msgid "Printer Group" msgstr "Grupo de Impressora" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" @@ -2539,75 +2564,81 @@ msgid "How should the conflict in the profile be resolved?" msgstr "Como o conflito no perfil deve ser resolvido?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:323 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +msgctxt "@action:label" +msgid "Intent" +msgstr "Objetivo" + +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 sobreposto" msgstr[1] "%1 sobrepostos" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:247 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:262 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:267 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 sobreposição" msgstr[1] "%1, %2 sobreposições" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:283 msgctxt "@action:label" msgid "Material settings" msgstr "Ajustes de material" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:284 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:299 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Como o conflito no material deve ser resolvido?" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:327 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:342 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidade dos ajustes" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:336 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:351 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:352 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:367 msgctxt "@action:label" msgid "Visible settings:" msgstr "Ajustes visíveis:" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:357 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:372 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de %2" -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:383 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Carregar um projeto limpará todos os modelos da mesa de impressão." -#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:401 +#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:416 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -2714,54 +2745,6 @@ msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." msgstr "Criar um backup automaticamente toda vez que o Cura iniciar." -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMainSettingsSelector.qml:75 -msgctxt "@label" -msgid "Not supported" -msgstr "Não suportado" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:35 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 -msgctxt "@label" -msgid "Tip" -msgstr "Dica" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 -msgctxt "@label" -msgid "Print experiment" -msgstr "Imprimir experimento" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:25 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificação" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:30 -msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:44 -msgctxt "@label" -msgid "Olsson Block" -msgstr "Bloco Olsson" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:30 msgctxt "@title" msgid "Build Plate Leveling" @@ -2847,170 +2830,176 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem certeza que deseja abortar a impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" msgstr "Informação" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar Mudança de Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "O novo diâmetro de filamento está ajustado em %1 mm, que não é compatível com o extrusor atual. Você deseja continuar?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" msgid "Display Name" msgstr "Exibir Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" msgstr "Tipo de Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" msgid "Color" msgstr "Cor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:205 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:208 msgctxt "@label" msgid "Properties" msgstr "Propriedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:210 msgctxt "@label" msgid "Density" msgstr "Densidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:222 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:225 msgctxt "@label" msgid "Diameter" msgstr "Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" msgstr "Custo do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" msgstr "Peso do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" msgstr "Comprimento do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" msgid "Cost per Meter" msgstr "Custo por Metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está vinculado a %1 e compartilha algumas de suas propriedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" msgstr "Desvincular Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:332 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" msgid "Description" msgstr "Descrição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:348 msgctxt "@label" msgid "Adhesion Information" msgstr "Informação sobre Aderência" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:126 msgctxt "@action:button" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:140 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:233 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:297 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:300 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:322 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:327 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com sucesso" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:345 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:357 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha em exportar material para %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:363 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado para %1 com sucesso" @@ -3025,27 +3014,27 @@ msgctxt "@label:textbox" msgid "Check all" msgstr "Verificar tudo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:48 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 msgctxt "@info:status" msgid "Calculated" msgstr "Calculado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 msgctxt "@title:column" msgid "Setting" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:82 msgctxt "@title:column" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:89 msgctxt "@title:column" msgid "Current" msgstr "Atual" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:83 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:97 msgctxt "@title:column" msgid "Unit" msgstr "Unidade" @@ -3056,307 +3045,301 @@ msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:132 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:143 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:210 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:223 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:279 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Você precisará reiniciar a aplicação para que essas mudanças tenham efeito." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:296 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Fatiar automaticamente quando mudar ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:304 msgctxt "@option:check" msgid "Slice automatically" msgstr "Fatiar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:318 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da área de visualização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Ressaltar áreas sem suporte do modelo em vermelho. Sem suporte, estas áreas não serão impressas corretamente." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335 msgctxt "@option:check" msgid "Display overhang" msgstr "Exibir seções pendentes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:343 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmera de modo que o modelo fique no centro da visão quando for selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centralizar câmera quanto o item é selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:358 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento default de ampliação deve ser invertido?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverter a direção da ampliação de câmera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "A ampliação (zoom) deve se mover na direção do mouse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:379 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Ampliar com o mouse não é suportado na perspectiva ortográfica." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Ampliar na direção do mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:410 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos devem ser movidos na plataforma de modo que não se sobreponham?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assegurar que os modelos sejam mantidos separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:424 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Os modelos devem ser movidos pra baixo pra se assentar na plataforma de impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:429 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automaticamente fazer os modelos caírem na mesa de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Exibir mensagem de alerta no leitor de G-Code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de alera no leitor de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:458 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A Visão de Camada deve ser forçada a ficar em modo de compatibilidade?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:463 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar modo de compatibilidade da visão de camadas (requer reinício)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 +msgctxt "@info:tooltip" +msgid "Should Cura open at the location it was closed?" +msgstr "O Cura deve abrir no lugar onde foi fechado?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 +msgctxt "@option:check" +msgid "Restore window position on start" +msgstr "Restaurar posição da janela no início" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Que tipo de renderização de câmera deve ser usada?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" -msgid "Camera rendering: " +msgid "Camera rendering:" msgstr "Renderização de câmera:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" msgstr "Perspectiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 msgid "Orthographic" msgstr "Ortográfica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrindo e salvando arquivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:545 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados dentro do volume de impressão se forem muito grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:550 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode ser carregado diminuto se sua unidade for por exemplo em metros ao invés de milímetros. Devem esses modelos ser redimensionados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos minúsculos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Os modelos devem ser selecionados após serem carregados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:580 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar modelos ao carregar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Um prefixo baseado no nome da impressora deve ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:595 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo de máquina ao nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Um resumo deve ser exibido ao salvar um arquivo de projeto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Exibir diálogo de resumo ao salvar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento default ao abrir um arquivo de projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento default ao abrir um arquivo de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Sempre me perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:642 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Sempre abrir como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:643 msgctxt "@option:openProject" msgid "Always import models" msgstr "Sempre importar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:679 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:693 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento default para valores de configuração alterados ao mudar para um perfil diferente: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:707 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Sempre descartar alterações da configuração" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:709 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Sempre transferir as alterações para o novo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:750 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve verificar novas atualizações quando o programa for iniciado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:755 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Verificar atualizações na inicialização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:765 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar informação (anônima) de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:779 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 -#: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 -msgctxt "@label" -msgid "Experimental" -msgstr "Experimental" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 -msgctxt "@info:tooltip" -msgid "Use multi build plate functionality" -msgstr "Usar funcionalidade de plataforma múltipla de impressão" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 -msgctxt "@option:check" -msgid "Use multi build plate functionality (restart required)" -msgstr "Usar funcionalidade de plataforma múltipla de impressão (reinício requerido)" - #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" @@ -3364,93 +3347,84 @@ msgid "Printers" msgstr "Impressoras" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:104 msgctxt "@label" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@label" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 msgctxt "@title:window" msgid "Create Profile" msgstr "Criar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:204 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Por favor dê um nome a este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renomear Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Default profiles" -msgstr "Perfis default" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 -msgctxt "@label" -msgid "Custom profiles" -msgstr "Perfis personalizados" - -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:257 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil usa os defaults especificados pela impressora, portanto não tem ajustes/sobreposições na lista abaixo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Seus ajustes atuais coincidem com o perfil selecionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globais" @@ -3515,35 +3489,35 @@ msgstr "Sem Título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" -msgid "search settings" -msgstr "procurar nos ajustes" +msgid "Search settings" +msgstr "Ajustes de busca" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:471 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:508 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:521 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não exibir este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter este ajuste visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." @@ -3575,17 +3549,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afetado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:187 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Este ajuste é sempre compartilhado entre todos os extrusores. Modificá-lo aqui mudará o valor para todos." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:191 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "O valor é resolvido de valores específicos de cada extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:230 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3596,7 +3570,7 @@ msgstr "" "\n" "Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:329 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3607,6 +3581,13 @@ msgstr "" "\n" "Clique para restaurar o valor calculado." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/NoIntentIcon.qml:31 +msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" +msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" +msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" +msgstr[0] "Não há perfil %1 para a configuração no extrusor %2. O objetivo default será usado no lugar dele" +msgstr[1] "Não há perfis %1 para a configurações nos extrusores %2. O objetivo default será usado no lugar deles" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" @@ -3647,26 +3628,11 @@ msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Habilita imprimir um brim (bainha) ou raft (jangada). Adicionará uma área chata em volta ou sob o objeto que é fácil de remover após a impressão ter finalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:175 -msgctxt "@label" -msgid "Layer Height" -msgstr "Altura de Camada" - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:81 msgctxt "@tooltip" msgid "You have modified some profile settings. If you want to change these go to custom mode." msgstr "Você modificou alguns ajustes de perfil. Se você quiser alterá-los, use o modo personalizado." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:355 -msgctxt "@tooltip" -msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." -msgstr "Este perfil de qualidade não está disponível para seu material e configuração de bico atuais. Por favor, altere-os para habilitar este perfil de qualidade." - -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:449 -msgctxt "@tooltip" -msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" -msgstr "Um perfil personalizado está atualmente ativo. Para habilitar o controle deslizante de qualidade, escolha um perfil de qualidade default na aba Personalizado" - #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:13 msgctxt "@label:Should be short" msgid "On" @@ -3677,12 +3643,17 @@ msgctxt "@label:Should be short" msgid "Off" msgstr "Off" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:27 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:33 +msgctxt "@label" +msgid "Experimental" +msgstr "Experimental" + +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:47 msgctxt "@label" msgid "Profile" msgstr "Perfil" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml:172 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3693,6 +3664,11 @@ msgstr "" "\n" "Clique para abrir o gerenciador de perfis." +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 +msgctxt "@label:header" +msgid "Custom profiles" +msgstr "Perfis personalizados" + #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." @@ -3820,11 +3796,16 @@ msgctxt "@label:category menu label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:42 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:46 msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:71 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3860,16 +3841,6 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desabilitar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:63 -msgctxt "@title:menu" -msgid "&Build plate" -msgstr "Plataforma de Impressão (&B)" - -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:66 -msgctxt "@title:settings" -msgid "&Profile" -msgstr "&Perfil" - #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:19 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" @@ -3949,12 +3920,12 @@ msgctxt "@header" msgid "Configurations" msgstr "Configurações" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:110 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:112 msgctxt "@label" msgid "Select configuration" msgstr "Selecione configuração" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:221 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:223 msgctxt "@label" msgid "Configurations" msgstr "Configurações" @@ -3984,12 +3955,12 @@ msgctxt "@label" msgid "Enabled" msgstr "Habilitado" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:250 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:251 msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:375 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:378 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Use cola para melhor aderência com essa combinação de materiais." @@ -4406,44 +4377,44 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:538 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechando o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Você tem certeza que deseja sair do Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:589 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:696 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:695 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:703 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir Arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:707 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:706 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontramos um ou mais arquivos de G-Code entre os arquivos que você selecionou. Você só pode abrir um arquivo de G-Code por vez. Se você quiser abrir um arquivo de G-Code, por favor selecione somente um." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:810 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:809 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:818 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:817 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -4514,17 +4485,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Sobre o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" msgid "version: %1" msgstr "versão: %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:72 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solução completa para impressão 3D com filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:84 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:85 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -4533,122 +4504,122 @@ msgstr "" "Cura é desenvolvido pela Ultimaker B.V. em cooperação com a comunidade.\n" "Cura orgulhosamente usa os seguintes projetos open-source:" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface Gráfica de usuário" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 msgctxt "@label" msgid "Application framework" msgstr "Framework de Aplicações" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 msgctxt "@label" msgid "G-code generator" msgstr "Gerador de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicação interprocessos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 msgctxt "@label" msgid "Programming language" msgstr "Linguagem de Programação" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 msgctxt "@label" msgid "GUI framework" msgstr "Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 msgctxt "@label" msgid "GUI framework bindings" msgstr "Ligações da Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de Ligações C/C++" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de Intercâmbio de Dados" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:144 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Bibliteca de suporte para computação científica" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de suporte para matemática acelerada" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de suporte para manuseamento de arquivos STL" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling planar objects" msgstr "Biblioteca de suporte para manuseamento de objetos planares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 msgctxt "@label" msgid "Support library for handling triangular meshes" msgstr "Biblioteca de suporte para manuseamento de malhas triangulares" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:149 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 msgctxt "@label" msgid "Support library for analysis of complex networks" msgstr "Biblioteca de suporte para análises de redes complexas" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de suporte para manuseamento de arquivos 3MF" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 msgctxt "@label" msgid "Support library for file metadata and streaming" msgstr "Biblioteca de suporte para streaming e metadados de arquivo" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicação serial" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de descoberta 'ZeroConf'" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recorte de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca de HTTP Python" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 msgctxt "@label" msgid "Font" msgstr "Fonte" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação de aplicação multidistribuição em Linux" @@ -4668,32 +4639,27 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salvar Projeto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 -msgctxt "@action:label" -msgid "Build plate" -msgstr "Plataforma de Impressão" - -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:177 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:192 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:194 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Não exibir resumo do projeto ao salvar novamente" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:302 msgctxt "@action:button" msgid "Save" msgstr "Salvar" @@ -4869,12 +4835,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Resolução de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:211 msgctxt "@label" msgid "Printer name" msgstr "Nome da impressora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:224 msgctxt "@text" msgid "Please give your printer a name" msgstr "Por favor dê um nome à sua impressora" @@ -4933,6 +4899,31 @@ msgctxt "@button" msgid "Get started" msgstr "Começar" +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 +msgctxt "@info:tooltip" +msgid "3D View" +msgstr "Visão 3D" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 +msgctxt "@info:tooltip" +msgid "Front View" +msgstr "Viso de Frente" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 +msgctxt "@info:tooltip" +msgid "Top View" +msgstr "Visão de Cima" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 +msgctxt "@info:tooltip" +msgid "Left View" +msgstr "Visão à Esquerda" + +#: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 +msgctxt "@info:tooltip" +msgid "Right View" +msgstr "Visão à Direita" + #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -4993,16 +4984,6 @@ msgctxt "name" msgid "Model Checker" msgstr "Verificador de Modelo" -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "description" -msgid "Dump the contents of all settings to a HTML file." -msgstr "Descarrega o conteúdo de todas as configurações em um arquivo HTML." - -#: cura-god-mode-plugin/src/GodMode/plugin.json -msgctxt "name" -msgid "God Mode" -msgstr "Modo Deus" - #: FirmwareUpdater/plugin.json msgctxt "description" msgid "Provides a machine actions for updating firmware." @@ -5013,16 +4994,6 @@ msgctxt "name" msgid "Firmware Updater" msgstr "Atualizador de Firmware" -#: ProfileFlattener/plugin.json -msgctxt "description" -msgid "Create a flattened quality changes profile." -msgstr "Cria um perfil de mudanças de qualidade achatado." - -#: ProfileFlattener/plugin.json -msgctxt "name" -msgid "Profile Flattener" -msgstr "Achatador de Perfil" - #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." @@ -5223,6 +5194,16 @@ msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" msgstr "Atualização de Versão de 3.3 para 3.4" +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Atualiza configurações do Cura 4.3 para o Cura 4.4." + +#: VersionUpgrade/VersionUpgrade43to44/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.3 to 4.4" +msgstr "Atualização de Versão de 4.3 para 4.4" + #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." @@ -5423,16 +5404,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de Perfis do Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente de Perfil de Impressão" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5473,6 +5444,158 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis do Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Flatten active settings" +#~ msgstr "Achatar os ajustes ativos" + +#~ msgctxt "@info:status" +#~ msgid "Profile has been flattened & activated." +#~ msgstr "O perfil foi achatado & ativado." + +#~ msgctxt "X3g Writer Plugin Description" +#~ msgid "Writes X3g to files" +#~ msgstr "Grava em formato X3g" + +#~ msgctxt "X3g Writer File Description" +#~ msgid "X3g File" +#~ msgstr "Arquivo X3g" + +#~ msgctxt "X3G Writer File Description" +#~ msgid "X3G File" +#~ msgstr "Arquivo X3G" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Open Compressed Triangle Mesh" +#~ msgstr "Malha Comprimida de Triângulos Aberta" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@action:button" +#~ msgid "Retry" +#~ msgstr "Tentar novamente" + +#~ msgctxt "@label:table_header" +#~ msgid "Print Core" +#~ msgstr "Núcleo de Impressão" + +#~ msgctxt "@label" +#~ msgid "Don't support overlap with other models" +#~ msgstr "Não suportar sobreposição com outros modelos" + +#~ msgctxt "@label" +#~ msgid "Modify settings for overlap with other models" +#~ msgstr "Modificar ajustes para sobrepor com outros modelos" + +#~ msgctxt "@label" +#~ msgid "Modify settings for infill of other models" +#~ msgstr "Modificar ajustes para preenchimento de outros modelos" + +#~ msgctxt "@action:ComboBox option" +#~ msgid "Update existing" +#~ msgstr "Atualizar existente" + +#~ msgctxt "@label" +#~ msgid "Not supported" +#~ msgstr "Não suportado" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Dica" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Imprimir experimento" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificação" + +#~ msgctxt "@label" +#~ msgid "Please select any upgrades made to this Ultimaker 2." +#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2." + +#~ msgctxt "@label" +#~ msgid "Olsson Block" +#~ msgstr "Bloco Olsson" + +#~ msgctxt "@window:text" +#~ msgid "Camera rendering: " +#~ msgstr "Renderização de câmera:" + +#~ msgctxt "@info:tooltip" +#~ msgid "Use multi build plate functionality" +#~ msgstr "Usar funcionalidade de plataforma múltipla de impressão" + +#~ msgctxt "@option:check" +#~ msgid "Use multi build plate functionality (restart required)" +#~ msgstr "Usar funcionalidade de plataforma múltipla de impressão (reinício requerido)" + +#~ msgctxt "@label" +#~ msgid "Default profiles" +#~ msgstr "Perfis default" + +#~ msgctxt "@label:textbox" +#~ msgid "search settings" +#~ msgstr "procurar nos ajustes" + +#~ msgctxt "@label" +#~ msgid "Layer Height" +#~ msgstr "Altura de Camada" + +#~ msgctxt "@tooltip" +#~ msgid "This quality profile is not available for your current material and nozzle configuration. Please change these to enable this quality profile." +#~ msgstr "Este perfil de qualidade não está disponível para seu material e configuração de bico atuais. Por favor, altere-os para habilitar este perfil de qualidade." + +#~ msgctxt "@tooltip" +#~ msgid "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab" +#~ msgstr "Um perfil personalizado está atualmente ativo. Para habilitar o controle deslizante de qualidade, escolha um perfil de qualidade default na aba Personalizado" + +#~ msgctxt "@title:menu" +#~ msgid "&Build plate" +#~ msgstr "Plataforma de Impressão (&B)" + +#~ msgctxt "@title:settings" +#~ msgid "&Profile" +#~ msgstr "&Perfil" + +#~ msgctxt "@action:label" +#~ msgid "Build plate" +#~ msgstr "Plataforma de Impressão" + +#~ msgctxt "description" +#~ msgid "Dump the contents of all settings to a HTML file." +#~ msgstr "Descarrega o conteúdo de todas as configurações em um arquivo HTML." + +#~ msgctxt "name" +#~ msgid "God Mode" +#~ msgstr "Modo Deus" + +#~ msgctxt "description" +#~ msgid "Create a flattened quality changes profile." +#~ msgstr "Cria um perfil de mudanças de qualidade achatado." + +#~ msgctxt "name" +#~ msgid "Profile Flattener" +#~ msgstr "Achatador de Perfil" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente de Perfil de Impressão" + #~ msgctxt "@info:status" #~ msgid "Connected over the network." #~ msgstr "Conectado pela rede." diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index b5a9dd2070..1a83dac735 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" -"PO-Revision-Date: 2019-03-18 11:27+0100\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" +"PO-Revision-Date: 2019-11-16 11:22-0300\n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 8faf6be4a9..643c2fed78 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-09-10 16:55+0000\n" -"PO-Revision-Date: 2019-09-22 21:19-0300\n" +"POT-Creation-Date: 2019-11-05 13:13+0000\n" +"PO-Revision-Date: 2019-11-16 07:10-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -1031,6 +1031,16 @@ msgctxt "bottom_layers description" msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, este valor é arredondado para um inteiro." +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Camadas Inferiores Iniciais" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "O número de camadas inferiores iniciais da plataforma de impressão pra cima. Quanto calculado a partir da espessura inferior, esse valor é arrendado para um número inteiro." + #: fdmprinter.def.json msgctxt "top_bottom_pattern label" msgid "Top/Bottom Pattern" @@ -3982,8 +3992,8 @@ msgstr "Área Mínima de Interface de Suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" -msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para polígonos de interface de suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." +msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "Mínimo tamanho de área para os polígonos da interface de suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -3992,8 +4002,8 @@ msgstr "Área Mínima de Teto de Suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" -msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para os tetos do suporte. Polígonos que tiverem área menor que este valor são serão gerados." +msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "Mínimo tamanho de área para os tetos do suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4002,8 +4012,8 @@ msgstr "Área Mínima de Base de Suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" -msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." -msgstr "Área mínima para as bases do suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." +msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." +msgstr "Mínimo tamanho de área para as bases do suport. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -4789,6 +4799,36 @@ msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." msgstr "Remove camadas vazias entre a primeira camada impressa se estiverem presentes. Desabilitar este ajuste pode criar camadas iniciais vazias se a Tolerância de Fatiamento estiver configurada para Exclusivo ou Meio." +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution label" +msgid "Maximum Resolution" +msgstr "Resolução Máxima" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_resolution description" +msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." +msgstr "O tamanho mínimo de um segmento de linha após o fatiamento. Se você aumentar este valor, a malha terá uma resolução menor. Isto pode permitir que a impressora mantenha a velocidade que precisa para processar o G-Code e aumentará a velocidade de fatiamento ao remover detalhes da malha que não poderia processar de qualquer jeito." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution label" +msgid "Maximum Travel Resolution" +msgstr "Máxima Resolução de Percurso" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_travel_resolution description" +msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." +msgstr "O tamanho mínimo de um segmento de linha de percurso após o fatiamento. Se o valor aumenta, os movimentos de percurso terão cantos menos suaves. Isto pode permitir que a impressora mantenha a velocidade necessária para processar o G-Code, mas pode fazer com que evitar topar no modelo fique menos preciso." + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation label" +msgid "Maximum Deviation" +msgstr "Desvio Máximo" + +#: fdmprinter.def.json +msgctxt "meshfix_maximum_deviation description" +msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." +msgstr "O desvio máximo permitido ao reduzir a resolução para o ajuste de Máxima Resolução. Se você aumentar isto, a impressão será menos precisa, mas o G-Code será menor. O Desvio Máximo é um limite para Resolução Máxima, portanto se os dois conflitarem o Desvio Máximo sempre será o valor dominante." + #: fdmprinter.def.json msgctxt "blackmagic label" msgid "Special Modes" @@ -5164,36 +5204,6 @@ msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polígonos em camadas fatiadas que tiverem uma circunferência menor que esta quantia serão excluídos. Menores valores levam a malha de maior resolução ao custo de tempo de fatiamento. Serve melhor para impressoras SLA de alta resolução e pequenos modelos 3D com muitos detalhes." -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution label" -msgid "Maximum Resolution" -msgstr "Resolução Máxima" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_resolution description" -msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "O tamanho mínimo de um segmento de linha após o fatiamento. Se você aumentar este valor, a malha terá uma resolução menor. Isto pode permitir que a impressora mantenha a velocidade que precisa para processar o G-Code e aumentará a velocidade de fatiamento ao remover detalhes da malha que não poderia processar de qualquer jeito." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution label" -msgid "Maximum Travel Resolution" -msgstr "Máxima Resolução de Percurso" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_travel_resolution description" -msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "O tamanho mínimo de um segmento de linha de percurso após o fatiamento. Se o valor aumenta, os movimentos de percurso terão cantos menos suaves. Isto pode permitir que a impressora mantenha a velocidade necessária para processar o G-Code, mas pode fazer com que evitar topar no modelo fique menos preciso." - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation label" -msgid "Maximum Deviation" -msgstr "Desvio Máximo" - -#: fdmprinter.def.json -msgctxt "meshfix_maximum_deviation description" -msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "O desvio máximo permitido ao reduzir a resolução para o ajuste de Máxima Resolução. Se você aumentar isto, a impressão será menos precisa, mas o G-Code será menor. O Desvio Máximo é um limite para Resolução Máxima, portanto se os dois conflitarem o Desvio Máximo sempre será o valor dominante." - #: fdmprinter.def.json msgctxt "support_skip_some_zags label" msgid "Break Up Support In Chunks" @@ -5334,16 +5344,6 @@ msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." msgstr "A velocidade pela qual se mover durante a desengrenagem, relativa à velocidade do caminho de extrusão. Um valor ligeiramente menor que 100% é sugerido, já que durante a desengrenagem a pressão dentro do hotend cai." -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation label" -msgid "Alternate Skin Rotation" -msgstr "Alterna a Rotação do Contorno" - -#: fdmprinter.def.json -msgctxt "skin_alternate_rotation description" -msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." -msgstr "Alterna a direção em que as camadas superiores e inferiores são impressas. Normalmente elas são impressas somente na diagonal. Este ajuste permite direções somente no X e somente no Y." - #: fdmprinter.def.json msgctxt "cross_infill_pocket_size label" msgid "Cross 3D Pocket Size" @@ -5516,23 +5516,23 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" -msgid "Flow rate compensation max extrusion offset" -msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo" +msgid "Flow Rate Compensation Max Extrusion Offset" +msgstr "Máximo Deslocamento de Extrusão de Compensação de Taxa de Fluxo" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" -msgid "The maximum distance in mm to compensate." -msgstr "A distância máxima em mm a compensar." +msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." +msgstr "A distância máxima em mm para mover o filamento para compensar mudanças na taxa de fluxo." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" -msgid "Flow rate compensation factor" -msgstr "Fator de compensaçõ de taxa de fluxo" +msgid "Flow Rate Compensation Factor" +msgstr "Fator de Compensação da Taxa de Fluxo" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" -msgid "The multiplication factor for the flow rate -> distance translation." -msgstr "O fator de multiplicação para a tradução entre taxa de fluxo -> distância." +msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." +msgstr "Em quanto mover o filamento para compensar mudanças na taxa de fluxo, como uma porcentagem da distância que o filamento seria movido em um segundo de extrusão." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5825,13 +5825,13 @@ msgstr "A diferença em tamanho da próxima camada comparada à anterior." #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" -msgid "Adaptive Layers Threshold" -msgstr "Limite das Camadas Adaptativas" +msgid "Adaptive Layers Topography Size" +msgstr "Tamanho da Topografia de Camadas Adaptativas" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" -msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." -msgstr "Limite até onde se usa uma camada menor ou não. Este número é comparado à tangente da ladeira mais vertical da camada." +msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." +msgstr "Trata da distância horizontal entre duas camadas adjacentes. Reduzir este ajuste faz com que camadas mais finas sejam usadas para reunir as bordas das camadas mais perto uma da outra." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5840,8 +5840,8 @@ msgstr "Ângulo de Parede Pendente" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." -msgstr "Paredes que têm inclinação maior que este ângulo serão impressas usando ajustes de seção pendente de parede. Quando o valor for 90, nenhuma parede será tratada como seção pendente." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +msgstr "Paredes que pendem por mais do que esse ângulo serão impressas usando ajustes de paredes pendentes. Quando este valor for 90, nenhuma parede será tratada como pendente. Seções pendentes que têm suportes também não serão tratadas como pendentes." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6220,18 +6220,18 @@ msgstr "Velocidade de Aspecto Pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" -msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Pequenos aspectos serão impressos com esta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." +msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Aspectos pequenos serão impressos nessa porcentagem da velocidade normal. Impressão mais lenta pode ajudar com aderência e precisão." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" -msgid "First Layer Speed" -msgstr "Velocidade da Primeira Camada" +msgid "Small Feature Initial Layer Speed" +msgstr "Velocidade de Camada Inicial de Aspecto Pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" -msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." +msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade de impressão normal. Impressão mais lenta pode ajudar com aderência e precisão." #: fdmprinter.def.json msgctxt "command_line_settings label" @@ -6293,6 +6293,66 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo após o carregamento do arquivo." +#~ msgctxt "minimum_interface_area description" +#~ msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para polígonos de interface de suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." + +#~ msgctxt "minimum_roof_area description" +#~ msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para os tetos do suporte. Polígonos que tiverem área menor que este valor são serão gerados." + +#~ msgctxt "minimum_bottom_area description" +#~ msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated." +#~ msgstr "Área mínima para as bases do suporte. Polígonos que tiverem uma área menor que este valor não serão gerados." + +#~ msgctxt "skin_alternate_rotation label" +#~ msgid "Alternate Skin Rotation" +#~ msgstr "Alterna a Rotação do Contorno" + +#~ msgctxt "skin_alternate_rotation description" +#~ msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions." +#~ msgstr "Alterna a direção em que as camadas superiores e inferiores são impressas. Normalmente elas são impressas somente na diagonal. Este ajuste permite direções somente no X e somente no Y." + +#~ msgctxt "flow_rate_max_extrusion_offset label" +#~ msgid "Flow rate compensation max extrusion offset" +#~ msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo" + +#~ msgctxt "flow_rate_max_extrusion_offset description" +#~ msgid "The maximum distance in mm to compensate." +#~ msgstr "A distância máxima em mm a compensar." + +#~ msgctxt "flow_rate_extrusion_offset_factor label" +#~ msgid "Flow rate compensation factor" +#~ msgstr "Fator de compensaçõ de taxa de fluxo" + +#~ msgctxt "flow_rate_extrusion_offset_factor description" +#~ msgid "The multiplication factor for the flow rate -> distance translation." +#~ msgstr "O fator de multiplicação para a tradução entre taxa de fluxo -> distância." + +#~ msgctxt "adaptive_layer_height_threshold label" +#~ msgid "Adaptive Layers Threshold" +#~ msgstr "Limite das Camadas Adaptativas" + +#~ msgctxt "adaptive_layer_height_threshold description" +#~ msgid "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer." +#~ msgstr "Limite até onde se usa uma camada menor ou não. Este número é comparado à tangente da ladeira mais vertical da camada." + +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging." +#~ msgstr "Paredes que têm inclinação maior que este ângulo serão impressas usando ajustes de seção pendente de parede. Quando o valor for 90, nenhuma parede será tratada como seção pendente." + +#~ msgctxt "small_feature_speed_factor description" +#~ msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Pequenos aspectos serão impressos com esta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." + +#~ msgctxt "small_feature_speed_factor_0 label" +#~ msgid "First Layer Speed" +#~ msgstr "Velocidade da Primeira Camada" + +#~ msgctxt "small_feature_speed_factor_0 description" +#~ msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." +#~ msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade normal de impressão. Impressão mais lenta pode ajudar com aderência e precisão." + #~ msgctxt "ironing_enabled description" #~ msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface." #~ msgstr "Passar sobre a superfície superior depois de impressa, mas sem extrudar material. A idéia é derreter o plástico do topo ainda mais, criando uma superfície mais lisa." From bce574c10b6ca52704e3c70418eeae76072bb702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Sat, 16 Nov 2019 13:14:07 -0300 Subject: [PATCH 947/994] Updated pt_BR strings for 4.4 --- resources/i18n/pt_BR/fdmprinter.def.json.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 643c2fed78..902111e5c0 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -3993,7 +3993,7 @@ msgstr "Área Mínima de Interface de Suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "Mínimo tamanho de área para os polígonos da interface de suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." +msgstr "Área mínima para os polígonos da interface de suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4003,7 +4003,7 @@ msgstr "Área Mínima de Teto de Suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "Mínimo tamanho de área para os tetos do suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." +msgstr "Área mínima para os tetos do suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4013,7 +4013,7 @@ msgstr "Área Mínima de Base de Suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "Mínimo tamanho de área para as bases do suport. Polígonos que têm área menor que este valor serão impressos como suporte normal." +msgstr "Área mínima para as bases do suport. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" From ec4831f0d08173906f7521f3283b41f790c1fbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Sat, 16 Nov 2019 13:15:14 -0300 Subject: [PATCH 948/994] Updated pt_BR strings for 4.4 --- resources/i18n/pt_BR/fdmextruder.def.json.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index 1a83dac735..2a89e4eb5d 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.3\n" +"Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-11-16 11:22-0300\n" From 39756b4e27c3a75db8f56d9de997212ac45c5e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Sat, 16 Nov 2019 13:16:11 -0300 Subject: [PATCH 949/994] Updated pt_BR strings for 4.4 --- resources/i18n/pt_BR/fdmprinter.def.json.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 902111e5c0..14f83b63b0 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -9,8 +9,8 @@ msgstr "" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" "PO-Revision-Date: 2019-11-16 07:10-0300\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 377a21071b170c605c7677b8af11219b43a574da Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 18 Nov 2019 11:33:36 +0100 Subject: [PATCH 950/994] Remove color from discard dialog text, since it uses system style Originally a lot of text would not be readable when in dark theme because the text would be light, but the background would always be white. --- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index afa9fda0bd..316878a2bd 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -100,7 +100,6 @@ UM.Dialog { text: styleData.value font: UM.Theme.getFont("system") - color: UM.Theme.getColor("setting_control_disabled_text") } } From 4ebec11fc73ad2d21c9978960e6e34f510def993 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 19 Nov 2019 11:40:11 +0100 Subject: [PATCH 951/994] Added 16 missing strings from lionbridge. part of CURA-6957 --- resources/i18n/de_DE/cura.po | 28 ++++++++++----------- resources/i18n/de_DE/fdmprinter.def.json.po | 6 +++-- resources/i18n/es_ES/cura.po | 28 ++++++++++----------- resources/i18n/es_ES/fdmprinter.def.json.po | 5 ++-- resources/i18n/fr_FR/cura.po | 28 ++++++++++----------- resources/i18n/fr_FR/fdmprinter.def.json.po | 6 +++-- resources/i18n/it_IT/cura.po | 28 ++++++++++----------- resources/i18n/it_IT/fdmprinter.def.json.po | 6 +++-- resources/i18n/ja_JP/cura.po | 28 ++++++++++----------- resources/i18n/ja_JP/fdmprinter.def.json.po | 4 +-- resources/i18n/ko_KR/cura.po | 28 ++++++++++----------- resources/i18n/ko_KR/fdmprinter.def.json.po | 4 +-- resources/i18n/nl_NL/cura.po | 28 ++++++++++----------- resources/i18n/nl_NL/fdmprinter.def.json.po | 6 +++-- resources/i18n/pt_PT/cura.po | 28 ++++++++++----------- resources/i18n/pt_PT/fdmprinter.def.json.po | 6 +++-- resources/i18n/ru_RU/cura.po | 28 ++++++++++----------- resources/i18n/ru_RU/fdmprinter.def.json.po | 6 +++-- resources/i18n/tr_TR/cura.po | 28 ++++++++++----------- resources/i18n/tr_TR/fdmprinter.def.json.po | 4 +-- resources/i18n/zh_CN/cura.po | 28 ++++++++++----------- resources/i18n/zh_CN/fdmprinter.def.json.po | 4 +-- 22 files changed, 189 insertions(+), 176 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 1fb0b93e39..3b0073bc31 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -279,17 +279,17 @@ msgstr "Druckfehler" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Neue Cloud-Drucker gefunden" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Es wurden neue Drucker gefunden, die Sie zu Ihrem Konto hinzufügen können. Sie finden diese in der Liste gefundener Drucker." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Diese Meldung nicht mehr anzeigen" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF-Bilddatei" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "Öffnen Sie das komprimierte Dreiecksnetz" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -2480,17 +2480,17 @@ msgstr "Als Stützstruktur drucken" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Einstellungen für Überlappungen ändern" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Überlappungen nicht unterstützen" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Nur Füllungen" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Projekt öffnen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Vorhandenes aktualisieren" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Neu erstellen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3188,7 +3188,7 @@ msgstr "Welches Kamera-Rendering sollte verwendet werden?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Kamera-Rendering:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Unbenannt" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Einstellungen durchsuchen" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Benutzerdefinierte Profile" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5197,12 +5197,12 @@ msgstr "Upgrade von Version 3.3 auf 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Aktualisiert Konfigurationen von Cura 4.3 auf Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Upgrade von Version 4.3 auf 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 142db39f5b..aee5ae4ace 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -6225,7 +6225,8 @@ msgstr "Detailgeschwindigkeit" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Bei kleinen Details wird die Geschwindigkeit auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere Druckgeschwindigkeit" +" können die Haftung und die Genauigkeit verbessert werden." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6235,7 +6236,8 @@ msgstr "Geschwindigkeit der ersten Schicht von Details" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Bei kleinen Details wird die Geschwindigkeit bei der ersten Schicht auf diesen Prozentsatz der normalen Druckgeschwindigkeit gesetzt. Durch eine niedrigere" +" Druckgeschwindigkeit können die Haftung und die Genauigkeit verbessert werden." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index ed2afbe602..8956c138ef 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -279,17 +279,17 @@ msgstr "Error de impresión" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Se han encontrado nuevas impresoras en la nube" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Se han encontrado nuevas impresoras conectadas a tu cuenta; puedes verlas en la lista de impresoras descubiertas." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "No volver a mostrar este mensaje" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2482,17 +2482,17 @@ msgstr "Imprimir como soporte" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Modificar los ajustes de las superposiciones" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "No es compatible con superposiciones" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Solo relleno" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2507,12 +2507,12 @@ msgstr "Abrir proyecto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Actualizar existente" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Crear nuevo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3190,7 +3190,7 @@ msgstr "¿Qué tipo de renderizado de cámara debería usarse?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Renderizado de cámara:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3492,7 +3492,7 @@ msgstr "Sin título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Buscar ajustes" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3669,7 +3669,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Perfiles personalizados" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5199,12 +5199,12 @@ msgstr "Actualización de la versión 3.3 a la 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Actualiza la configuración de Cura 4.3 a Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Actualización de la versión 4.3 a la 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5468,7 +5468,7 @@ msgstr "Lector de perfiles de Cura" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 4da8cfa20c..fbaf241481 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -6225,7 +6225,7 @@ msgstr "Velocidad de pequeñas partes" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Las pequeñas partes se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión y la precisión." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6235,7 +6235,8 @@ msgstr "Velocidad de la capa inicial de partes pequeñas" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Las pequeñas partes de la primera capa se imprimirán a este porcentaje de su velocidad de impresión normal. Una impresión más lenta puede mejorar la adhesión" +" y la precisión." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index bc8db83d25..3633753794 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -279,17 +279,17 @@ msgstr "Erreur d'impression" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Nouvelles imprimantes cloud trouvées" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "De nouvelles imprimantes ont été trouvées connectées à votre compte. Vous pouvez les trouver dans votre liste d'imprimantes découvertes." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Ne plus afficher ce message" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "Image GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "Ouvrir le maillage triangulaire compressé" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -2480,17 +2480,17 @@ msgstr "Imprimer comme support" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Modifier les paramètres de chevauchement" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Ne prend pas en charge le chevauchement" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Remplissage uniquement" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Ouvrir un projet" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Mettre à jour l'existant" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Créer" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3188,7 +3188,7 @@ msgstr "Quel type de rendu de la caméra doit-il être utilisé?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Rendu caméra :" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Sans titre" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Paramètres de recherche" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Personnaliser les profils" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5197,12 +5197,12 @@ msgstr "Mise à niveau de 3.3 vers 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Configurations des mises à niveau de Cura 4.3 vers Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Mise à niveau de 4.3 vers 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 80642448ea..9779482577 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -6226,7 +6226,8 @@ msgstr "Vitesse de petite structure" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Les petites structures seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider à l'adhésion et à la" +" précision." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6236,7 +6237,8 @@ msgstr "Vitesse de la couche initiale de petite structure" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Les petites structures sur la première couche seront imprimées à ce pourcentage de la vitesse d'impression normale. Une impression plus lente peut aider" +" à l'adhésion et à la précision." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index ab8bd7b2d2..b215eae599 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -279,17 +279,17 @@ msgstr "Errore di stampa" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Nuove stampanti in cloud rilevate" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Sono state trovate nuove stampanti collegate al tuo account. Puoi vederle nell'elenco delle stampanti rilevate." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Non mostrare nuovamente questo messaggio" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2482,17 +2482,17 @@ msgstr "Stampa come supporto" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Modificare le impostazioni per le sovrapposizioni" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Non supportano le sovrapposizioni" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Solo riempimento" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2507,12 +2507,12 @@ msgstr "Apri progetto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Aggiorna esistente" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Crea nuovo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3190,7 +3190,7 @@ msgstr "Quale tipo di rendering della fotocamera è necessario utilizzare?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Rendering fotocamera:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3492,7 +3492,7 @@ msgstr "Senza titolo" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Impostazioni ricerca" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3669,7 +3669,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Profili personalizzati" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5199,12 +5199,12 @@ msgstr "Aggiornamento della versione da 3.3 a 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Aggiorna le configurazioni da Cura 4.3 a Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Aggiornamento della versione da 4.3 a 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5468,7 +5468,7 @@ msgstr "Lettore profilo Cura" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index c16f2eff85..2f7a93df43 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -6227,7 +6227,8 @@ msgstr "Velocità dettagli piccole dimensioni" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "I dettagli di piccole dimensioni verranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare in termini di" +" adesione e precisione." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6237,7 +6238,8 @@ msgstr "Velocità layer iniziale per dettagli di piccole dimensioni" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "I dettagli di piccole dimensioni sul primo layer saranno stampati a questa percentuale della velocità di stampa normale. Una stampa più lenta può aiutare" +" in termini di adesione e precisione." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 69cf78ac46..def6a45abf 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -279,17 +279,17 @@ msgstr "印刷エラー" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "新しいクラウドプリンターが見つかりました" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "アカウントに接続された新しいプリンターが見つかりました。検出されたプリンターのリストで確認できます。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "今後このメッセージを表示しない" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF画像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "圧縮トライアングルメッシュを開く" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -2478,17 +2478,17 @@ msgstr "サポートとしてプリント" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "オーバーラップの設定を変更" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "オーバーラップをサポートしない" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "インフィルのみ" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2503,12 +2503,12 @@ msgstr "プロジェクトを開く" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "既存を更新する" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "新しいものを作成する" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3188,7 +3188,7 @@ msgstr "どのような種類のカメラレンダリングを使用する必要 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "カメラレンダリング:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "無題" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "検索設定" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3662,7 +3662,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "カスタムプロファイル" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5188,12 +5188,12 @@ msgstr "3.3から3.4にバージョンアップグレート" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Cura 4.3からCura 4.4へのコンフィグレーションアップグレート。" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "4.3から4.4にバージョンアップグレート" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 40dab42b37..a53f3de7ca 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -6362,7 +6362,7 @@ msgstr "Small Feature Speed" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "小型形体は通常のプリント速度に対してこの割合でプリントされます。低速でプリントすると、接着と精度が向上します。" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6372,7 +6372,7 @@ msgstr "小型形体の初期レイヤー速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "最初のレイヤーの小型形体は通常のプリント速度に対してこの割合でプリントされます。低速でプリントすると、接着と精度が向上します。" #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 1e8e4db07f..824cc276e8 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -279,17 +279,17 @@ msgstr "프린트 오류" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "새 프린터를 찾을 수 없음" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "새 프린터가 계정에 연결되어 있습니다. 발견한 프린터를 목록에서 찾을 수 있습니다." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "다시 메시지 표시 안 함" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2477,17 +2477,17 @@ msgstr "서포터로 프린팅" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "오버랩 설정 수정" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "오버랩 지원 안함" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "내부채움 전용" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2502,12 +2502,12 @@ msgstr "프로젝트 열기" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "기존 업데이트" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "새로 만들기" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3183,7 +3183,7 @@ msgstr "어떤 유형의 카메라 렌더링을 사용해야 합니까?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "카메라 렌더링:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3485,7 +3485,7 @@ msgstr "제목 없음" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "검색 설정" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3661,7 +3661,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "사용자 정의 프로파일" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5183,12 +5183,12 @@ msgstr "버전 업그레이드 3.3에서 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Cura 4.3에서 Cura 4.4로 구성을 업그레이드합니다." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "4.3에서 4.4로 버전 업그레이드" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5452,7 +5452,7 @@ msgstr "Cura 프로파일 리더" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 6377245a76..4aa764bcce 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -6219,7 +6219,7 @@ msgstr "소형 피처 속도" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 부착과 정확도가 개선됩니다." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6229,7 +6229,7 @@ msgstr "소형 피처 초기 레이어 속도" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "첫 번째 레이어의 소형 피처는 정상적인 프린트 속도의 이 비율로 프린팅됩니다. 프린트 속도가 느리면 부착과 정확도가 개선됩니다." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 1f47d9de09..2f9ffe5802 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -279,17 +279,17 @@ msgstr "Printfout" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Nieuwe cloudprinters gevonden" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Er zijn nieuwe printers gedetecteerd die zijn verbonden met uw account. U kunt ze vinden in uw lijst met gedetecteerde printers." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Dit bericht niet meer weergeven" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF-afbeelding" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "Gecomprimeerde driehoeksnet openen" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -2480,17 +2480,17 @@ msgstr "Printen als supportstructuur" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Instellingen aanpassen voor overlapping" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Supportstructuur niet laten overlappen" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Alleen vulling" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Project openen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Bestaand(e) bijwerken" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Nieuw maken" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3188,7 +3188,7 @@ msgstr "Welk type cameraweergave moet worden gebruikt?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Cameraweergave:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Zonder titel" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "instellingen zoeken" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Aangepaste profielen" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5197,12 +5197,12 @@ msgstr "Versie-upgrade van 3.3 naar 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.3 naar Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Versie-upgrade van 4.3 naar 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index b371932564..d145a50f7c 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -6224,7 +6224,8 @@ msgstr "Klein kenmerksnelheid" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Kleine kernmerken worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan de hechting en" +" nauwkeurigheid verbeteren." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6234,7 +6235,8 @@ msgstr "Kleine kenmerken eerste laagsnelheid" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Kleine kenmerken op de eerste laag worden geprint met een snelheid die gelijk is aan dit percentage van hun normale printsnelheid. Langzamer printen kan" +" de hechting en nauwkeurigheid verbeteren." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 4f0d2ccc81..a7765c66a3 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -285,17 +285,17 @@ msgstr "Erro de impressão" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Encontradas novas impressoras na cloud" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Foram encontradas novas impressoras associadas à sua conta. Pode encontrá-las na sua lista de impressoras detetadas." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Não mostrar esta mensagem novamente" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2503,17 +2503,17 @@ msgstr "Imprimir como suporte" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Modificar definições para sobreposições" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Não suportar sobreposições" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Apenas enchimento" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2528,12 +2528,12 @@ msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Atualizar existente" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Criar nova" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3215,7 +3215,7 @@ msgstr "Que tipo de composição de câmara deve ser utilizado?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Composição de câmara:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3519,7 +3519,7 @@ msgstr "Sem título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Procurar definições" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3712,7 +3712,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Perfis personalizados" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5254,12 +5254,12 @@ msgstr "Atualização da versão 3.3 para 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Configurações de atualizações do Cura 4.3 para o Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Atualização da versão 4.3 para 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5528,7 +5528,7 @@ msgstr "Leitor de Perfis Cura" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index c2418d1a61..5e4b070c5f 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -6396,7 +6396,8 @@ msgstr "Velocidade de elemento pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Os elementos pequenos serão impressos a esta percentagem da respetiva velocidade de impressão normal. Uma impressão mais lenta pode ajudar em termos de" +" aderência e precisão." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6406,7 +6407,8 @@ msgstr "Velocidade da camada inicial de partes pequenas" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Os elementos pequenos na primeira camada serão impressos a esta percentagem da respetiva velocidade de impressão normal. Uma impressão mais lenta pode" +" ajudar em termos de aderência e precisão." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index b1aa3eb8fb..a8bab05fd7 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -279,17 +279,17 @@ msgstr "Ошибка печати" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Обнаружены новые облачные принтеры" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Обнаружены новые принтеры, подключенные к вашей учетной записи; вы можете найти их в списке обнаруженных принтеров." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Больше не показывать это сообщение" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2481,17 +2481,17 @@ msgstr "Печать в качестве поддержки" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Изменить настройки для перекрытий" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Не поддерживать перекрытия" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Только заполнение" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2506,12 +2506,12 @@ msgstr "Открытие проекта" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Обновить существующий" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Создать новый" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3191,7 +3191,7 @@ msgstr "Рендеринг камеры какого типа следует и #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Рендеринг камеры:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3493,7 +3493,7 @@ msgstr "Без имени" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Параметры поиска" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3671,7 +3671,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Собственные профили" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5207,12 +5207,12 @@ msgstr "Обновление версии 3.3 до 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Обновляет конфигурации Cura 4.3 до Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "Обновление версии 4.3 до 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5476,7 +5476,7 @@ msgstr "Чтение профиля Cura" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 6dc5284211..f9f16b4d46 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -6224,7 +6224,8 @@ msgstr "Скорость для малых элементов" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Малые элементы будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить адгезию" +" и точность." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6234,7 +6235,8 @@ msgstr "Скорость первого слоя для небольших об #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Малые элементы на первом слое будут напечатаны со скоростью, составляющей этот процент от их нормальной скорости печати. Более медленная печать может улучшить" +" адгезию и точность." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 07810ddae1..b58a394a66 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -279,17 +279,17 @@ msgstr "Baskı hatası" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "Yeni bulut yazıcılar bulundu" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "Hesabınıza bağlı yeni yazıcılar bulundu. Keşfedilen yazıcılar listenizde bunları görüntüleyebilirsiniz." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "Bu mesajı bir daha gösterme" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -2480,17 +2480,17 @@ msgstr "Destek olarak yazdır" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "Çakışma ayarlarını değiştir" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "Çakışmaları destekleme" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "Yalnızca dolgu" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Proje Aç" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "Var olanları güncelleştir" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "Yeni oluştur" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3188,7 +3188,7 @@ msgstr "Ne tür bir kamera oluşturma işlemi kullanılmalıdır?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "Kamera oluşturma:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Başlıksız" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "Arama ayarları" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "Özel profiller" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5197,12 +5197,12 @@ msgstr "3.3'dan 3.4'e Sürüm Yükseltme" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "Yapılandırmaları Cura 4.3'ten Cura 4.4'e yükseltir." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "4.3'ten 4.4'e Sürüm Yükseltme" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" @@ -5466,7 +5466,7 @@ msgstr "Cura Profil Okuyucu" #~ msgctxt "@item:inlistbox" #~ msgid "Open Compressed Triangle Mesh" -#~ msgstr "Open Compressed Triangle Mesh" +#~ msgstr "" #~ msgctxt "@item:inmenu" #~ msgid "Profile Assistant" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 20f91722f1..4b8b49454d 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -6223,7 +6223,7 @@ msgstr "Küçük Özellik Hızı" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "Küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6233,7 +6233,7 @@ msgstr "Küçük Özellik İlk Katman Hızı" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "İlk katman üzerindeki küçük özellikler normal baskı hızının bu yüzdesinde basılacaktır. Daha yavaş baskı, yapışma ve doğruluğu artırmaya yardımcı olabilir." #: fdmprinter.def.json msgctxt "command_line_settings label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 6291113925..dc4252852f 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -279,17 +279,17 @@ msgstr "打印错误" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "New cloud printers found" +msgstr "发现新的云打印机" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "New printers have been found connected to your account, you can find them in your list of discovered printers." +msgstr "发现有新打印机连接到您的帐户。您可以在已发现的打印机列表中查找新连接的打印机。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "Do not show this message again" +msgstr "不再显示此消息" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "GIF 图像" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "Open Compressed Triangle Mesh" +msgstr "打开压缩三角网格" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -2479,17 +2479,17 @@ msgstr "打印为支撑" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "Modify settings for overlaps" +msgstr "修改重叠设置" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "Don't support overlaps" +msgstr "不支持重叠" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "Infill only" +msgstr "仅填充" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2504,12 +2504,12 @@ msgstr "打开项目" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "Update existing" +msgstr "更新已有配置" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "Create new" +msgstr "新建" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -3185,7 +3185,7 @@ msgstr "应使用哪种类型的摄像头进行渲染？" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Camera rendering:" +msgstr "摄像头渲染：" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3487,7 +3487,7 @@ msgstr "未命名" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "Search settings" +msgstr "搜索设置" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3663,7 +3663,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "Custom profiles" +msgstr "自定义配置文件" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -5187,12 +5187,12 @@ msgstr "版本升级3.3到3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Upgrades configurations from Cura 4.3 to Cura 4.4." +msgstr "将配置从 Cura 4.3 升级至 Cura 4.4。" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "Version Upgrade 4.3 to 4.4" +msgstr "版本自 4.3 升级至 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index ca718e36db..2de81b585d 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -6221,7 +6221,7 @@ msgstr "微小特征速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" @@ -6231,7 +6231,7 @@ msgstr "微小特征初始层速度" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." +msgstr "第一层的微小特征将按正常打印速度的百分比进行打印。缓慢打印有助于粘合和提高准确性。" #: fdmprinter.def.json msgctxt "command_line_settings label" From b74ee9704872663d8a025118ca44d46ed14e4b3a Mon Sep 17 00:00:00 2001 From: Ellecross <32929710+Ellecross@users.noreply.github.com> Date: Tue, 19 Nov 2019 11:49:30 +0100 Subject: [PATCH 952/994] Update change_log.txt to have 4.4 changes --- resources/texts/change_log.txt | 86 +++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index cdf0e979cd..b51777fe4f 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,85 @@ +[4.4.0] +*Intent profiles. +What’s the intent of your print? A rapid prototype? A visual prototype? An end-use part with specific holes sizes? Intent profiles accelerate the CAD-CAM workflow by preconfiguring all the right settings in Ultimaker Cura for each of these use cases. Simply select a profile that matches the intent of your design, slice, and you’re ready to print immediately, without the need to adjust the typical settings. For now, there are three Intent profiles: +*‘Draft’ +Intended for initial prototypes and concept validation, and will print your design in the shortest time possible. +*‘Engineering’ +Intended for high-dimensional accuracy, to print functional prototypes and mechanical end-use parts. +*‘Visual’ +Intended for visual prototypes and prints that need excellent aesthetic quality. +For now, these profiles work for the Ultimaker S5 and Ultimaker S3 with Ultimaker PLA, Tough PLA, and ABS materials, and include PVA and Breakaway combinations. More profiles will follow over time. + +*Per-model settings. +Per-model settings are a set of very powerful features for users who need to tweak specific settings in specific parts of the model. In previous releases these were buried in the interface somewhat, so this release has made them more discoverable with clear icons in the toolbar, so everyone can discover them. The per-model settings can now be accessed both when working from the recommended and the custom print settings mode. + +*Specify network printer. +When connected to an Ultimaker Connect group of multiple printers, Ultimaker Cura once again shows a pop-up to select a designated printer for your printjob. This functionality had been disabled in the last version to ensure reliability when printing remotely. + +*Performance improvements. +Various tweaks under the hood for a snappier, more responsive interface. This improvement is most noticeable when switching extruders, print profiles, hovering over tooltips and when scrolling through the print settings list. + +*SDK version increment. +The changes made in version 4.4 (mainly for intents but also other things) are so thorough that we needed to do a major increment of the SDK version. Contributors – please update your packages! + +*Pause at height message. +A setting has been added to the pause at height script that displays a custom message on screen. This can be used to give instructions to operators to perform an action during the pause, e.g. ‘Place 626 bearings in slots now’. + +*Restore window preference. +https://github.com/fieldOfView has contributed a new preference around restoring the previous window position/size to the last used position/size on start up. This would be a workaround for those setups where starting Ultimaker Cura on a secondary screen will prevent it from working. + +*Group Linux instances. +https://github.com/MatthewCroughan has contributed a fix so that multiple instances of Ultimaker Cura get grouped in one application group in Gnome (the Linux front-end). It adds a bit of metadata to the .desktop file so that the windows can be grouped. + +* Known bugs +Cura not starting on Windows 10. Some users started reporting that Ultimaker Cura 4.3 and higher did not start properly, fur unknown reasons. We have implemented some code to get a better understanding of the issue, but we have not been able to fix it just yet. +As a quick fix: Go to the install path, by default “C:\Program Files\Ultimaker Cura 4.4”. Right click Cura.exe and select ‘properties’. Click the ‘compatibility’ tab and select “Run This Program in Compatibility Mode For: Windows 8”. If this does not fix your issue, please contact your service provider. + +* Minor improvements + - Reweighting stages. + - Small plug-in system improvements + - Add RetractContinue post-processing script + - Add DisplayRemainingTimeOnLCD post-processing script + - Thickness of the very bottom layer + +* Updated third party printers + - Strateo3D. https://github.com/KOUBeMT has updated the machine profile for Strateo3D. + - Key3D Tyro. https://github.com/DragonJe has created a definition, extruder, and profiles for the Key3D Tyro. + - Prusa i3 MK3/MK3S printer. https://github.com/samirabaza has contributed the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with a minor modification to fit in Prusa folder under "add printer". + - Hellbot printer. https://github.com/F-Fischer has contributed a machine profile for the Hellbot printer. + - HMS434 update + - Add CR-10 MAX and Ender-5 plus + - Modify Cubicon device profile + - Add Cubicon printer definitions + +* Bug fixes + - Re-calculating retraction-safe area with every wall + - Fix Normals after Mirror Operation + - Crash when loading PJ with creality + - Per-object setting stacks checked for errors even if they are empty + - getAngleLeft gives wrong results when lines are colinear + - Lots of qml warnings regarding MaterialsTypeSelection.qml + - PR: Avoid unwanted travel with ironing + - PR: Remove all travel moves < 5um + - AMF files are mirrored + - Changes to Material diameter do not get applied + - Long string of text on profile names goes through borders + - CURA 4.3 - Crash when connecting networked Ultimaker S5 + - Layer slider falls behind action panel, on low resolution displays only. + - Deleting profiles will not update the size of the drop-down menu + - Create / Update / Discard options are enabled when they should be greyed out + - Scroll bar for profile dropdown + - Can't change printhead X/Y Min/Max + - Syncing to a printer that has both nozzles disabled causes Cura to crash + - Project file open behavior preference is ignored when opening from command line. + - Create CFFF printer and change nozzle diameter will cause a crash + - Pause At Height resumes with wrong speed + - One-at-a-time ordering wrong + - Fix license extraction from CuraPackage + - Invalid firmware for UM2 update continues forever + - Infill inset too much with connected lines and thicker infill + - Reworked line polygon crossings + - Build Interface If Support Is Present + [4.3.0] *Ultimaker S3. This release includes a new profile for our latest S-line of 3D printers: the Ultimaker S3. Eagle-eyed beta testers may have noticed this extra printer profile in the beta release, too. Well done to those who spotted it. Learn more about the Ultimaker S3 by reading the blog on Ultimaker.com. @@ -72,7 +154,7 @@ Improved code quality resulting in improved stability. - Settings not updating in GUI with inheritance. Fixed settings not updating GUI with inheritance. - Prevent 'generic'-part in name of specific materials. Introduced checks for ‘generic’ material types to help material categorization. - Hide temperature settings. The "Default Print Temperature" setting is currently editable, but editing this setting can cause problems with temperatures later especially when you have it in your custom profile. We decided to hide this setting so users can no longer edit it in the later releases to avoid confusion. The "Default Build Plate Temperature" has also been hidden because it causes a similar issue. -- Add machine_heated_build_volume. Introduced a new machine_heated_build_volume machine-setting, which is set it to false by default, and only set it to true for the Ultimaker S5. Users can alter their own definition if they do have a heated build volume. +- Add machine_heated_build_volume. Introduced a new machine_heated_build_volume machine-setting, which is set it to false by default, and only set it to true for the Ultimaker S5. Users can alter their own definition if they do have a heated build volume. - Z-hops on first layer. First move other start GCODE not z-hopped. Contributed by sailorgreg. - Preserve extruder-only moves in post stretch script. Contributed by sgtnoodle. - “Print via Cloud” is no longer possible without an Internet connection @@ -188,7 +270,7 @@ Gcode now contains comments to indicate when a prime tower is printed, like so: Previously, the maximum deviation was hard-coded in CuraEngine to be half of the maximum resolution. A new setting has been added that sets the maximum allowed deviation from the original polygon when reducing model resolution. If line segments are shorter than the maximum resolution, they are removed, unless this introduces a deviation greater than the maximum deviation. *Gyroid support. -Smartavionics has contributed a new option for a gyroid support pattern, similar to his gyroid infill contribution. A gyroid pattern is relatively efficient with material, so gyroid patterns permeable to water can dissolve faster. It’s also easier to pull gyroid structures off your model with pliers compared to some other support patterns. https://github.com/smartavionics +Smartavionics has contributed a new option for a gyroid support pattern, similar to his gyroid infill contribution. A gyroid pattern is relatively efficient with material, so gyroid patterns permeable to water can dissolve faster. It’s also easier to pull gyroid structures off your model with pliers compared to some other support patterns. https://github.com/smartavionics *Purchase materials. The Marketplace now includes a direct link to a site where users can buy specific materials to work with the corresponding print profile. The link is specified by the print profile supplier through the contributor portal. From dfe468ef68b0e5a6ca6654d59547d571cfa0e5a6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 19 Nov 2019 11:58:39 +0100 Subject: [PATCH 953/994] Added translations from out Brazilian volunteer. part of CURA-6957 --- resources/i18n/pt_BR/cura.po | 72 ++++++++++---------- resources/i18n/pt_BR/fdmextruder.def.json.po | 6 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 36 +++++----- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 39125eed3c..b5f81cfbf2 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0100\n" -"PO-Revision-Date: 2019-09-17 06:50-0300\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"PO-Revision-Date: 2019-11-15 16:30-0300\n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,17 +279,17 @@ msgstr "Erro de impressão" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:21 msgctxt "@info:title" msgid "New cloud printers found" -msgstr "" +msgstr "Novas impressoras de nuvem encontradas" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:22 msgctxt "@info:message" msgid "New printers have been found connected to your account, you can find them in your list of discovered printers." -msgstr "" +msgstr "Novas impressoras foram encontradas conectadas à sua conta; você as pode ver na sua lista de impressoras descobertas." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudPrinterDetectedMessage.py:27 msgctxt "@info:option_text" msgid "Do not show this message again" -msgstr "" +msgstr "Não mostrar essa mensagem novamente" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -493,7 +493,7 @@ msgstr "Imagem GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Open Compressed Triangle Mesh" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" @@ -735,7 +735,7 @@ msgstr "Não Suportado" #: /home/ruben/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:196 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:125 @@ -987,37 +987,37 @@ msgstr "Cancelar" #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:320 msgctxt "@label" msgid "Default" -msgstr "" +msgstr "Default" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:39 msgctxt "@label" msgid "Visual" -msgstr "" +msgstr "Visual" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:40 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." -msgstr "" +msgstr "O perfil visual é projetado para imprimir protótipos e modelos virtuais com o objetivo de alta qualidade visual e de superfície." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:43 msgctxt "@label" msgid "Engineering" -msgstr "" +msgstr "Engenharia" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:44 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." -msgstr "" +msgstr "O perfil de engenharia é projetado para imprimir protótipos funcionais e partes de uso final com o objetivo de melhor precisão e tolerâncias mais estritas." #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:47 msgctxt "@label" msgid "Draft" -msgstr "" +msgstr "Rascunho" #: /home/ruben/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:48 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." -msgstr "" +msgstr "O perfil de rascunho é projetado para imprimir protótipos iniciais e validações de conceito com o objetivo de redução significativa de tempo de impressão." #: /home/ruben/Projects/Cura/cura/Machines/Models/ExtrudersModel.py:208 msgctxt "@menuitem" @@ -1288,7 +1288,7 @@ msgstr "Carregando máquinas..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:520 msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "" +msgstr "Ajustando preferências..." #: /home/ruben/Projects/Cura/cura/CuraApplication.py:824 msgctxt "@info:progress" @@ -2480,17 +2480,17 @@ msgstr "Imprimir como suporte" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:109 msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "" +msgstr "Modificar ajustes para sobreposições" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:121 msgctxt "@label" msgid "Don't support overlaps" -msgstr "" +msgstr "Não suportar sobreposições" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:145 msgctxt "@action:checkbox" msgid "Infill only" -msgstr "" +msgstr "Preenchimento apenas" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:368 msgctxt "@action:button" @@ -2505,12 +2505,12 @@ msgstr "Abrir Projeto" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" -msgstr "" +msgstr "Atualizar existentes" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:59 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "" +msgstr "Criar novos" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:70 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:73 @@ -2575,7 +2575,7 @@ msgstr "Nome" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" -msgstr "" +msgstr "Objetivo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:246 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 @@ -3173,12 +3173,12 @@ msgstr "Forçar modo de compatibilidade da visão de camadas (requer reinício)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:473 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "" +msgstr "O Cura deve abrir no lugar onde foi fechado?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478 msgctxt "@option:check" msgid "Restore window position on start" -msgstr "" +msgstr "Restaurar posição da janela no início" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 msgctxt "@info:tooltip" @@ -3188,7 +3188,7 @@ msgstr "Que tipo de renderização de câmera deve ser usada?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "" +msgstr "Renderização de câmera:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 msgid "Perspective" @@ -3490,7 +3490,7 @@ msgstr "Sem Título" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:68 msgctxt "@label:textbox" msgid "Search settings" -msgstr "" +msgstr "Ajustes de busca" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:462 msgctxt "@action:menu" @@ -3585,8 +3585,8 @@ msgstr "" msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Não há perfil %1 para a configuração no extrusor %2. O objetivo default será usado no lugar dele" +msgstr[1] "Não há perfis %1 para a configurações nos extrusores %2. O objetivo default será usado no lugar deles" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" @@ -3667,7 +3667,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:160 msgctxt "@label:header" msgid "Custom profiles" -msgstr "" +msgstr "Perfis personalizados" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -4902,27 +4902,27 @@ msgstr "Começar" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:27 msgctxt "@info:tooltip" msgid "3D View" -msgstr "" +msgstr "Visão 3D" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:40 msgctxt "@info:tooltip" msgid "Front View" -msgstr "" +msgstr "Viso de Frente" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "" +msgstr "Visão de Cima" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" msgid "Left View" -msgstr "" +msgstr "Visão à Esquerda" #: /home/ruben/Projects/Cura/resources/qml/ViewOrientationControls.qml:79 msgctxt "@info:tooltip" msgid "Right View" -msgstr "" +msgstr "Visão à Direita" #: MachineSettingsAction/plugin.json msgctxt "description" @@ -5197,12 +5197,12 @@ msgstr "Atualização de Versão de 3.3 para 3.4" #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" +msgstr "Atualiza configurações do Cura 4.3 para o Cura 4.4." #: VersionUpgrade/VersionUpgrade43to44/plugin.json msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "" +msgstr "Atualização de Versão de 4.3 para 4.4" #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "description" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index 9f91e3cfee..2a89e4eb5d 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" -"PO-Revision-Date: 2019-03-18 11:27+0100\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"PO-Revision-Date: 2019-11-16 11:22-0300\n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 68fa4ae9db..14f83b63b0 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: Cura 4.4\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-11-05 13:13+0000\n" -"PO-Revision-Date: 2019-09-22 21:19-0300\n" -"Last-Translator: Cláudio Sampaio \n" -"Language-Team: Cláudio Sampaio \n" +"PO-Revision-Date: 2019-11-16 07:10-0300\n" +"Last-Translator: Cláudio Sampaio \n" +"Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1034,12 +1034,12 @@ msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, #: fdmprinter.def.json msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" -msgstr "" +msgstr "Camadas Inferiores Iniciais" #: fdmprinter.def.json msgctxt "initial_bottom_layers description" msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" +msgstr "O número de camadas inferiores iniciais da plataforma de impressão pra cima. Quanto calculado a partir da espessura inferior, esse valor é arrendado para um número inteiro." #: fdmprinter.def.json msgctxt "top_bottom_pattern label" @@ -3993,7 +3993,7 @@ msgstr "Área Mínima de Interface de Suporte" #: fdmprinter.def.json msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Área mínima para os polígonos da interface de suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_roof_area label" @@ -4003,7 +4003,7 @@ msgstr "Área Mínima de Teto de Suporte" #: fdmprinter.def.json msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Área mínima para os tetos do suporte. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "minimum_bottom_area label" @@ -4013,7 +4013,7 @@ msgstr "Área Mínima de Base de Suporte" #: fdmprinter.def.json msgctxt "minimum_bottom_area description" msgid "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "" +msgstr "Área mínima para as bases do suport. Polígonos que têm área menor que este valor serão impressos como suporte normal." #: fdmprinter.def.json msgctxt "support_interface_offset label" @@ -5517,22 +5517,22 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow Rate Compensation Max Extrusion Offset" -msgstr "" +msgstr "Máximo Deslocamento de Extrusão de Compensação de Taxa de Fluxo" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "" +msgstr "A distância máxima em mm para mover o filamento para compensar mudanças na taxa de fluxo." #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" msgid "Flow Rate Compensation Factor" -msgstr "" +msgstr "Fator de Compensação da Taxa de Fluxo" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "" +msgstr "Em quanto mover o filamento para compensar mudanças na taxa de fluxo, como uma porcentagem da distância que o filamento seria movido em um segundo de extrusão." #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5826,12 +5826,12 @@ msgstr "A diferença em tamanho da próxima camada comparada à anterior." #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive Layers Topography Size" -msgstr "" +msgstr "Tamanho da Topografia de Camadas Adaptativas" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." -msgstr "" +msgstr "Trata da distância horizontal entre duas camadas adjacentes. Reduzir este ajuste faz com que camadas mais finas sejam usadas para reunir as bordas das camadas mais perto uma da outra." #: fdmprinter.def.json msgctxt "wall_overhang_angle label" @@ -5841,7 +5841,7 @@ msgstr "Ângulo de Parede Pendente" #: fdmprinter.def.json msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "" +msgstr "Paredes que pendem por mais do que esse ângulo serão impressas usando ajustes de paredes pendentes. Quando este valor for 90, nenhuma parede será tratada como pendente. Seções pendentes que têm suportes também não serão tratadas como pendentes." #: fdmprinter.def.json msgctxt "wall_overhang_speed_factor label" @@ -6221,17 +6221,17 @@ msgstr "Velocidade de Aspecto Pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Aspectos pequenos serão impressos nessa porcentagem da velocidade normal. Impressão mais lenta pode ajudar com aderência e precisão." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "Small Feature Initial Layer Speed" -msgstr "" +msgstr "Velocidade de Camada Inicial de Aspecto Pequeno" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy." -msgstr "" +msgstr "Aspectos pequenos na primeira camada serão impressos nesta porcentagem de sua velocidade de impressão normal. Impressão mais lenta pode ajudar com aderência e precisão." #: fdmprinter.def.json msgctxt "command_line_settings label" From c6f42766c76c7179f7c3b2400da19418486f6a96 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 19 Nov 2019 12:59:39 +0100 Subject: [PATCH 954/994] Remove hardcoded sizes from dialogs & popups Contributes to #6670 --- plugins/3MFReader/WorkspaceDialog.qml | 4 ++-- plugins/Toolbox/resources/qml/Toolbox.qml | 4 ++-- resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml | 4 ++-- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- resources/qml/Preferences/MachinesPage.qml | 2 -- resources/themes/cura-light/theme.json | 3 +++ 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index a38c53457c..d0fd3d0846 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -13,8 +13,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Open Project") - minimumWidth: 500 * screenScaleFactor - minimumHeight: 450 * screenScaleFactor + minimumWidth: UM.Theme.getSize("popup_dialog").width + minimumHeight: UM.Theme.getSize("popup_dialog").height width: minimumWidth height: minimumHeight diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index 03fd3468f6..d6d862b5f6 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -20,8 +20,8 @@ Window modality: Qt.ApplicationModal flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint - width: Math.floor(720 * screenScaleFactor) - height: Math.floor(640 * screenScaleFactor) + width: UM.Theme.getSize("large_popup_dialog").width + height: UM.Theme.getSize("large_popup_dialog").height minimumWidth: width maximumWidth: minimumWidth minimumHeight: height diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 2566a2d44c..8cdaeea5fa 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -18,8 +18,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Open project file") - width: 450 * screenScaleFactor - height: 150 * screenScaleFactor + width: UM.Theme.getSize("small_popup_dialog").width + height: UM.Theme.getSize("small_popup_dialog").height maximumHeight: height maximumWidth: width diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 316878a2bd..a7701cf059 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -14,8 +14,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Discard or Keep changes") - width: 800 * screenScaleFactor - height: 400 * screenScaleFactor + width: UM.Theme.getSize("popup_dialog").width + height: UM.Theme.getSize("popup_dialog").height property var changesModel: Cura.UserChangesModel{ id: userChangesModel} onVisibilityChanged: { diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 39789cd192..8adcb65fcf 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -148,8 +148,6 @@ UM.ManagementPage UM.RenameDialog { id: renameDialog; - width: 300 * screenScaleFactor - height: 150 * screenScaleFactor object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""; property var machine_name_validator: Cura.MachineNameValidator { } validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null; diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 055f176b33..e5009d8633 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -441,6 +441,9 @@ "sizes": { "window_minimum_size": [80, 48], + "large_popup_dialog": [48, 40], + "popup_dialog": [40, 36], + "small_popup_dialog": [36, 12], "main_window_header": [0.0, 4.0], "main_window_header_button": [8, 2.35], From d425764da8b0ddaf372b5287cf5efa581c2402b0 Mon Sep 17 00:00:00 2001 From: Ellecross <32929710+Ellecross@users.noreply.github.com> Date: Tue, 19 Nov 2019 13:17:33 +0100 Subject: [PATCH 955/994] Added contributors to PRs --- resources/texts/change_log.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index b51777fe4f..dfb3ab0ab1 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -37,8 +37,8 @@ As a quick fix: Go to the install path, by default “C:\Program Files\Ultimaker * Minor improvements - Reweighting stages. - Small plug-in system improvements - - Add RetractContinue post-processing script - - Add DisplayRemainingTimeOnLCD post-processing script + - Add RetractContinue post-processing script by https://github.com/thopiekar + - Add DisplayRemainingTimeOnLCD post-processing script by https://github.com/iLyngklip - Thickness of the very bottom layer * Updated third party printers @@ -46,25 +46,25 @@ As a quick fix: Go to the install path, by default “C:\Program Files\Ultimaker - Key3D Tyro. https://github.com/DragonJe has created a definition, extruder, and profiles for the Key3D Tyro. - Prusa i3 MK3/MK3S printer. https://github.com/samirabaza has contributed the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with a minor modification to fit in Prusa folder under "add printer". - Hellbot printer. https://github.com/F-Fischer has contributed a machine profile for the Hellbot printer. - - HMS434 update - - Add CR-10 MAX and Ender-5 plus - - Modify Cubicon device profile - - Add Cubicon printer definitions + - HMS434 update by https://github.com/maukcc + - Add CR-10 MAX and Ender-5 plus by https://github.com/trouch + - Modify Cubicon device profile by https://github.com/HUNIBEST-HyVISION + - Add Cubicon printer definitions by https://github.com/HUNIBEST-HyVISION * Bug fixes - - Re-calculating retraction-safe area with every wall + - Re-calculating retraction-safe area with every wall by https://github.com/smartavionics - Fix Normals after Mirror Operation - Crash when loading PJ with creality - - Per-object setting stacks checked for errors even if they are empty + - Per-object setting stacks checked for errors even if they are empty by https://github.com/smartavionics - getAngleLeft gives wrong results when lines are colinear - Lots of qml warnings regarding MaterialsTypeSelection.qml - - PR: Avoid unwanted travel with ironing - - PR: Remove all travel moves < 5um + - PR: Avoid unwanted travel with ironing by https://github.com/smartavionics + - PR: Remove all travel moves < 5um by https://github.com/smartavionics - AMF files are mirrored - Changes to Material diameter do not get applied - Long string of text on profile names goes through borders - CURA 4.3 - Crash when connecting networked Ultimaker S5 - - Layer slider falls behind action panel, on low resolution displays only. + - Layer slider falls behind action panel, on low resolution displays only by https://github.com/AMI3 - Deleting profiles will not update the size of the drop-down menu - Create / Update / Discard options are enabled when they should be greyed out - Scroll bar for profile dropdown @@ -76,9 +76,9 @@ As a quick fix: Go to the install path, by default “C:\Program Files\Ultimaker - One-at-a-time ordering wrong - Fix license extraction from CuraPackage - Invalid firmware for UM2 update continues forever - - Infill inset too much with connected lines and thicker infill - - Reworked line polygon crossings - - Build Interface If Support Is Present + - Infill inset too much with connected lines and thicker infill by https://github.com/smartavionics + - Reworked line polygon crossings by https://github.com/smartavionics + [4.3.0] *Ultimaker S3. From f1f02904589167fabe353e038503d9e399cb1e83 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 19 Nov 2019 14:22:53 +0100 Subject: [PATCH 956/994] Re-enable the Polish language. part of CURA-6957 --- resources/qml/Preferences/GeneralPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index e3e5062049..5ce309cf8b 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -160,7 +160,7 @@ UM.PreferencesPage append({ text: "日本語", code: "ja_JP" }) append({ text: "한국어", code: "ko_KR" }) append({ text: "Nederlands", code: "nl_NL" }) - //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) + append({ text: "Polski", code: "pl_PL" }) append({ text: "Português do Brasil", code: "pt_BR" }) append({ text: "Português", code: "pt_PT" }) append({ text: "Русский", code: "ru_RU" }) From 94a5b5ef90c7afab7b114f086c084b95e36728c5 Mon Sep 17 00:00:00 2001 From: Dimitriovski Date: Tue, 19 Nov 2019 15:27:17 +0100 Subject: [PATCH 957/994] CURA-6522_one_at_a_time_overlapping_build_area Changed the setting_version to 11 --- .../VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py | 2 +- resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 +- resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 +- resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 2 +- resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 +- .../intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 +- resources/quality/abax_pri3/apri3_pla_fast.inst.cfg | 2 +- resources/quality/abax_pri3/apri3_pla_high.inst.cfg | 2 +- resources/quality/abax_pri3/apri3_pla_normal.inst.cfg | 2 +- resources/quality/abax_pri5/apri5_pla_fast.inst.cfg | 2 +- resources/quality/abax_pri5/apri5_pla_high.inst.cfg | 2 +- resources/quality/abax_pri5/apri5_pla_normal.inst.cfg | 2 +- resources/quality/abax_titan/atitan_pla_fast.inst.cfg | 2 +- resources/quality/abax_titan/atitan_pla_high.inst.cfg | 2 +- resources/quality/abax_titan/atitan_pla_normal.inst.cfg | 2 +- .../quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg | 2 +- .../quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg | 2 +- .../quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg | 2 +- resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg | 2 +- resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg | 2 +- resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg | 2 +- .../anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg | 2 +- .../quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg | 2 +- .../anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg | 2 +- .../anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg | 2 +- .../quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg | 2 +- .../anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg | 2 +- .../quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg | 2 +- .../quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg | 2 +- .../quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg | 2 +- .../quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg | 2 +- resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg | 2 +- .../quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg | 2 +- .../quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg | 2 +- .../quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg | 2 +- .../quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg | 2 +- .../quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg | 2 +- resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg | 2 +- .../builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg | 2 +- .../builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg | 2 +- resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PET_Normal_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg | 2 +- resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg | 2 +- resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_global_Coarse_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_global_High_Quality.inst.cfg | 2 +- .../quality/builder_premium/bp_global_Normal_Quality.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg | 2 +- .../quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg | 2 +- .../quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg | 2 +- resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg | 2 +- .../cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg | 2 +- .../cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg | 2 +- .../quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg | 2 +- .../cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../quality/cartesio/cartesio_global_High_Quality.inst.cfg | 2 +- .../quality/cartesio/cartesio_global_Normal_Quality.inst.cfg | 2 +- .../quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg | 2 +- .../quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg | 2 +- resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg | 2 +- .../quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg | 2 +- .../quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg | 2 +- .../cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg | 2 +- .../quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg | 2 +- .../cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg | 2 +- .../quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg | 2 +- .../quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg | 2 +- resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg | 2 +- .../quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg | 2 +- .../quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg | 2 +- resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg | 2 +- .../quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg | 2 +- .../quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg | 2 +- .../cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg | 2 +- .../quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg | 2 +- .../quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg | 2 +- .../quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg | 2 +- resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg | 2 +- .../quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg | 2 +- .../quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg | 2 +- resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg | 2 +- resources/quality/coarse.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_ABS_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_PETG_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_PLA_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_ABS_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_ABS_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PETG_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PETG_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PLA_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_PLA_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.3_TPU_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_ABS_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_ABS_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PETG_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PETG_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PLA_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_PLA_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.4_TPU_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_ABS_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_ABS_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PETG_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PETG_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PLA_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_PLA_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.5_TPU_super.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_PLA_low.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg | 2 +- resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg | 2 +- resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg | 2 +- resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg | 2 +- resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg | 2 +- resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg | 2 +- resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg | 2 +- resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg | 2 +- resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg | 2 +- resources/quality/creality/base/base_global_adaptive.inst.cfg | 2 +- resources/quality/creality/base/base_global_draft.inst.cfg | 2 +- resources/quality/creality/base/base_global_low.inst.cfg | 2 +- resources/quality/creality/base/base_global_standard.inst.cfg | 2 +- resources/quality/creality/base/base_global_super.inst.cfg | 2 +- resources/quality/creality/base/base_global_ultra.inst.cfg | 2 +- resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg | 2 +- .../quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg | 2 +- resources/quality/dagoma/dagoma_global_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_global_fine.inst.cfg | 2 +- resources/quality/dagoma/dagoma_global_standard.inst.cfg | 2 +- resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg | 2 +- resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_global_High_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg | 2 +- .../deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg | 2 +- resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg | 2 +- .../quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg | 2 +- resources/quality/draft.inst.cfg | 2 +- resources/quality/extra_coarse.inst.cfg | 2 +- resources/quality/extra_fast.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_abs_high.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_pla_high.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg | 2 +- resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg | 2 +- resources/quality/fast.inst.cfg | 2 +- .../quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg | 2 +- .../quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg | 2 +- .../quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg | 2 +- .../gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg | 2 +- resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg | 2 +- resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg | 2 +- resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg | 2 +- .../quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg | 2 +- resources/quality/high.inst.cfg | 2 +- resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg | 2 +- resources/quality/hms434/hms434_global_High_Quality.inst.cfg | 2 +- resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg | 2 +- resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg | 2 +- resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg | 2 +- resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg | 2 +- resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg | 2 +- .../imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg | 2 +- .../imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg | 2 +- .../imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg | 2 +- .../imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg | 2 +- .../imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg | 2 +- .../imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg | 2 +- .../imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg | 2 +- .../quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg | 2 +- .../quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg | 2 +- .../quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg | 2 +- .../imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg | 2 +- .../PETG/jb2_generic_petg_0.4_coarse.inst.cfg | 2 +- .../imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg | 2 +- .../PETG/jb2_generic_petg_0.4_medium.inst.cfg | 2 +- .../imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg | 2 +- .../imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg | 2 +- .../imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg | 2 +- .../PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg | 2 +- resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg | 2 +- resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg | 2 +- resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg | 2 +- .../quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg | 2 +- .../quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg | 2 +- .../quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg | 2 +- .../quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg | 2 +- resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_best.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_fast.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_normal.inst.cfg | 2 +- .../quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg | 2 +- resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg | 2 +- resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg | 2 +- .../quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg | 2 +- .../quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg | 2 +- .../malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg | 2 +- .../quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg | 2 +- .../quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_High_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg | 2 +- .../malyan_m200_global_ThickerDraft_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg | 2 +- .../malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg | 2 +- .../quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg | 2 +- .../quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg | 2 +- .../quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg | 2 +- .../quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg | 2 +- .../malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg | 2 +- .../malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg | 2 +- .../quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg | 2 +- .../malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg | 2 +- .../quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg | 2 +- resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg | 2 +- resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg | 2 +- .../quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg | 2 +- .../quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg | 2 +- .../malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg | 2 +- .../quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg | 2 +- .../quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_draft.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_fast.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_high.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_normal.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_ultra.inst.cfg | 2 +- .../abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_Draft_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_Fast_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_High_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_Normal_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg | 2 +- ...onoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg | 2 +- .../monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_high.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg | 2 +- .../nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_draft.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_fast.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_high.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_normal.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_ultra.inst.cfg | 2 +- .../pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_draft.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_fast.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_high.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_normal.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_ultra.inst.cfg | 2 +- .../petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_draft.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_fast.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_high.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_normal.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_ultra.inst.cfg | 2 +- .../pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg | 2 +- resources/quality/normal.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 2 +- resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg | 2 +- resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg | 2 +- resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg | 2 +- resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg | 2 +- resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_A.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_B.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_C.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_D.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_E.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_F.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_G.inst.cfg | 2 +- resources/quality/strateo3d/s3d_global_H.inst.cfg | 2 +- .../quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg | 2 +- resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg | 2 +- .../quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg | 2 +- .../tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg | 2 +- .../tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg | 2 +- .../quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg | 2 +- .../pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg | 2 +- .../tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg | 2 +- .../tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg | 2 +- .../tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_dual_classic_abs_normal.inst.cfg | 2 +- .../abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg | 2 +- .../abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg | 2 +- .../flex/tizyx_evy_dual_classic_flex_flex.inst.cfg | 2 +- .../flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg | 2 +- .../flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg | 2 +- .../flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg | 2 +- .../petg/tizyx_evy_dual_classic_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_dual_classic_petg_normal.inst.cfg | 2 +- .../petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg | 2 +- .../petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg | 2 +- .../tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg | 2 +- .../pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg | 2 +- .../tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_dual_classic_pla_normal.inst.cfg | 2 +- .../tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg | 2 +- .../pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg | 2 +- .../tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg | 2 +- .../tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg | 2 +- .../tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg | 2 +- .../tizyx_evy_dual_global_Normal_Quality.inst.cfg | 2 +- .../tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg | 2 +- resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg | 2 +- resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg | 2 +- resources/quality/ultimaker2/um2_draft.inst.cfg | 2 +- resources/quality/ultimaker2/um2_fast.inst.cfg | 2 +- resources/quality/ultimaker2/um2_high.inst.cfg | 2 +- resources/quality/ultimaker2/um2_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg | 2 +- .../ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg | 2 +- .../um2p_global_Slightly_Coarse_Quality.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- .../ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg | 2 +- resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg | 2 +- .../quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg | 2 +- .../ultimaker_original/umo_global_Coarse_Quality.inst.cfg | 2 +- .../ultimaker_original/umo_global_Draft_Quality.inst.cfg | 2 +- .../ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg | 2 +- .../quality/ultimaker_original/umo_global_High_Quality.inst.cfg | 2 +- .../ultimaker_original/umo_global_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg | 2 +- .../quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg | 2 +- .../quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg | 2 +- .../quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg | 2 +- .../quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg | 2 +- .../vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg | 2 +- resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg | 2 +- resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg | 2 +- resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg | 2 +- resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg | 2 +- resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg | 2 +- resources/variants/cartesio_0.25.inst.cfg | 2 +- resources/variants/cartesio_0.4.inst.cfg | 2 +- resources/variants/cartesio_0.8.inst.cfg | 2 +- resources/variants/creality_base_0.2.inst.cfg | 2 +- resources/variants/creality_base_0.3.inst.cfg | 2 +- resources/variants/creality_base_0.4.inst.cfg | 2 +- resources/variants/creality_base_0.5.inst.cfg | 2 +- resources/variants/creality_base_0.6.inst.cfg | 2 +- resources/variants/creality_base_0.8.inst.cfg | 2 +- resources/variants/creality_base_1.0.inst.cfg | 2 +- resources/variants/creality_cr10_0.2.inst.cfg | 2 +- resources/variants/creality_cr10_0.3.inst.cfg | 2 +- resources/variants/creality_cr10_0.4.inst.cfg | 2 +- resources/variants/creality_cr10_0.5.inst.cfg | 2 +- resources/variants/creality_cr10_0.6.inst.cfg | 2 +- resources/variants/creality_cr10_0.8.inst.cfg | 2 +- resources/variants/creality_cr10_1.0.inst.cfg | 2 +- resources/variants/creality_cr10max_0.2.inst.cfg | 2 +- resources/variants/creality_cr10max_0.3.inst.cfg | 2 +- resources/variants/creality_cr10max_0.4.inst.cfg | 2 +- resources/variants/creality_cr10max_0.5.inst.cfg | 2 +- resources/variants/creality_cr10max_0.6.inst.cfg | 2 +- resources/variants/creality_cr10max_0.8.inst.cfg | 2 +- resources/variants/creality_cr10max_1.0.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.2.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.3.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.4.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.5.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.6.inst.cfg | 2 +- resources/variants/creality_cr10mini_0.8.inst.cfg | 2 +- resources/variants/creality_cr10mini_1.0.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.2.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.3.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.4.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.5.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.6.inst.cfg | 2 +- resources/variants/creality_cr10s4_0.8.inst.cfg | 2 +- resources/variants/creality_cr10s4_1.0.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.2.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.3.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.4.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.5.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.6.inst.cfg | 2 +- resources/variants/creality_cr10s5_0.8.inst.cfg | 2 +- resources/variants/creality_cr10s5_1.0.inst.cfg | 2 +- resources/variants/creality_cr10s_0.2.inst.cfg | 2 +- resources/variants/creality_cr10s_0.3.inst.cfg | 2 +- resources/variants/creality_cr10s_0.4.inst.cfg | 2 +- resources/variants/creality_cr10s_0.5.inst.cfg | 2 +- resources/variants/creality_cr10s_0.6.inst.cfg | 2 +- resources/variants/creality_cr10s_0.8.inst.cfg | 2 +- resources/variants/creality_cr10s_1.0.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.2.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.3.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.4.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.5.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.6.inst.cfg | 2 +- resources/variants/creality_cr10spro_0.8.inst.cfg | 2 +- resources/variants/creality_cr10spro_1.0.inst.cfg | 2 +- resources/variants/creality_cr20_0.2.inst.cfg | 2 +- resources/variants/creality_cr20_0.3.inst.cfg | 2 +- resources/variants/creality_cr20_0.4.inst.cfg | 2 +- resources/variants/creality_cr20_0.5.inst.cfg | 2 +- resources/variants/creality_cr20_0.6.inst.cfg | 2 +- resources/variants/creality_cr20_0.8.inst.cfg | 2 +- resources/variants/creality_cr20_1.0.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.2.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.3.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.4.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.5.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.6.inst.cfg | 2 +- resources/variants/creality_cr20pro_0.8.inst.cfg | 2 +- resources/variants/creality_cr20pro_1.0.inst.cfg | 2 +- resources/variants/creality_ender2_0.2.inst.cfg | 2 +- resources/variants/creality_ender2_0.3.inst.cfg | 2 +- resources/variants/creality_ender2_0.4.inst.cfg | 2 +- resources/variants/creality_ender2_0.5.inst.cfg | 2 +- resources/variants/creality_ender2_0.6.inst.cfg | 2 +- resources/variants/creality_ender2_0.8.inst.cfg | 2 +- resources/variants/creality_ender2_1.0.inst.cfg | 2 +- resources/variants/creality_ender3_0.2.inst.cfg | 2 +- resources/variants/creality_ender3_0.3.inst.cfg | 2 +- resources/variants/creality_ender3_0.4.inst.cfg | 2 +- resources/variants/creality_ender3_0.5.inst.cfg | 2 +- resources/variants/creality_ender3_0.6.inst.cfg | 2 +- resources/variants/creality_ender3_0.8.inst.cfg | 2 +- resources/variants/creality_ender3_1.0.inst.cfg | 2 +- resources/variants/creality_ender4_0.2.inst.cfg | 2 +- resources/variants/creality_ender4_0.3.inst.cfg | 2 +- resources/variants/creality_ender4_0.4.inst.cfg | 2 +- resources/variants/creality_ender4_0.5.inst.cfg | 2 +- resources/variants/creality_ender4_0.6.inst.cfg | 2 +- resources/variants/creality_ender4_0.8.inst.cfg | 2 +- resources/variants/creality_ender4_1.0.inst.cfg | 2 +- resources/variants/creality_ender5_0.2.inst.cfg | 2 +- resources/variants/creality_ender5_0.3.inst.cfg | 2 +- resources/variants/creality_ender5_0.4.inst.cfg | 2 +- resources/variants/creality_ender5_0.5.inst.cfg | 2 +- resources/variants/creality_ender5_0.6.inst.cfg | 2 +- resources/variants/creality_ender5_0.8.inst.cfg | 2 +- resources/variants/creality_ender5_1.0.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.2.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.3.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.4.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.5.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.6.inst.cfg | 2 +- resources/variants/creality_ender5plus_0.8.inst.cfg | 2 +- resources/variants/creality_ender5plus_1.0.inst.cfg | 2 +- resources/variants/deltacomb_025_e3d.inst.cfg | 2 +- resources/variants/deltacomb_040_e3d.inst.cfg | 2 +- resources/variants/deltacomb_080_e3d.inst.cfg | 2 +- resources/variants/fabtotum_hyb35.inst.cfg | 2 +- resources/variants/fabtotum_lite04.inst.cfg | 2 +- resources/variants/fabtotum_lite06.inst.cfg | 2 +- resources/variants/fabtotum_pro02.inst.cfg | 2 +- resources/variants/fabtotum_pro04.inst.cfg | 2 +- resources/variants/fabtotum_pro06.inst.cfg | 2 +- resources/variants/fabtotum_pro08.inst.cfg | 2 +- resources/variants/felixpro2_0.25.inst.cfg | 2 +- resources/variants/felixpro2_0.35.inst.cfg | 2 +- resources/variants/felixpro2_0.50.inst.cfg | 2 +- resources/variants/felixpro2_0.70.inst.cfg | 2 +- resources/variants/felixtec4_0.25.inst.cfg | 2 +- resources/variants/felixtec4_0.35.inst.cfg | 2 +- resources/variants/felixtec4_0.50.inst.cfg | 2 +- resources/variants/felixtec4_0.70.inst.cfg | 2 +- resources/variants/gmax15plus_025_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_04_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_05_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_05_jhead.inst.cfg | 2 +- resources/variants/gmax15plus_06_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_08_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_10_jhead.inst.cfg | 2 +- resources/variants/gmax15plus_12_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_025_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_04_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_05_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_05_jhead.inst.cfg | 2 +- resources/variants/gmax15plus_dual_06_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_08_e3d.inst.cfg | 2 +- resources/variants/gmax15plus_dual_10_jhead.inst.cfg | 2 +- resources/variants/hms434_0.4tpnozzle.inst.cfg | 2 +- resources/variants/hms434_0.8tpnozzle.inst.cfg | 2 +- resources/variants/imade3d_jellybox_0.4.inst.cfg | 2 +- resources/variants/imade3d_jellybox_2_0.4.inst.cfg | 2 +- resources/variants/nwa3d_a31_04.inst.cfg | 2 +- resources/variants/nwa3d_a31_06.inst.cfg | 2 +- resources/variants/strateo3d_standard_04.inst.cfg | 2 +- resources/variants/strateo3d_standard_06.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg | 2 +- resources/variants/tizyx_evy_0.2.inst.cfg | 2 +- resources/variants/tizyx_evy_0.3.inst.cfg | 2 +- resources/variants/tizyx_evy_0.4.inst.cfg | 2 +- resources/variants/tizyx_evy_0.5.inst.cfg | 2 +- resources/variants/tizyx_evy_0.6.inst.cfg | 2 +- resources/variants/tizyx_evy_0.8.inst.cfg | 2 +- resources/variants/tizyx_evy_1.0.inst.cfg | 2 +- resources/variants/tizyx_evy_dual_classic.inst.cfg | 2 +- resources/variants/tizyx_evy_dual_direct_drive.inst.cfg | 2 +- resources/variants/tizyx_k25_0.2.inst.cfg | 2 +- resources/variants/tizyx_k25_0.3.inst.cfg | 2 +- resources/variants/tizyx_k25_0.4.inst.cfg | 2 +- resources/variants/tizyx_k25_0.5.inst.cfg | 2 +- resources/variants/tizyx_k25_0.6.inst.cfg | 2 +- resources/variants/tizyx_k25_0.8.inst.cfg | 2 +- resources/variants/tizyx_k25_1.0.inst.cfg | 2 +- resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg | 2 +- resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg | 2 +- resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg | 2 +- resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg | 2 +- resources/variants/ultimaker2_extended_plus_0.25.inst.cfg | 2 +- resources/variants/ultimaker2_extended_plus_0.4.inst.cfg | 2 +- resources/variants/ultimaker2_extended_plus_0.6.inst.cfg | 2 +- resources/variants/ultimaker2_extended_plus_0.8.inst.cfg | 2 +- resources/variants/ultimaker2_olsson_0.25.inst.cfg | 2 +- resources/variants/ultimaker2_olsson_0.4.inst.cfg | 2 +- resources/variants/ultimaker2_olsson_0.6.inst.cfg | 2 +- resources/variants/ultimaker2_olsson_0.8.inst.cfg | 2 +- resources/variants/ultimaker2_plus_0.25.inst.cfg | 2 +- resources/variants/ultimaker2_plus_0.4.inst.cfg | 2 +- resources/variants/ultimaker2_plus_0.6.inst.cfg | 2 +- resources/variants/ultimaker2_plus_0.8.inst.cfg | 2 +- resources/variants/ultimaker3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker3_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker3_aa04.inst.cfg | 2 +- resources/variants/ultimaker3_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker3_bb04.inst.cfg | 2 +- resources/variants/ultimaker3_extended_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker3_extended_aa04.inst.cfg | 2 +- resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker3_extended_bb04.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker_s3_aa04.inst.cfg | 2 +- resources/variants/ultimaker_s3_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker_s3_bb04.inst.cfg | 2 +- resources/variants/ultimaker_s3_cc06.inst.cfg | 2 +- resources/variants/ultimaker_s5_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker_s5_aa0.8.inst.cfg | 2 +- resources/variants/ultimaker_s5_aa04.inst.cfg | 2 +- resources/variants/ultimaker_s5_aluminum.inst.cfg | 2 +- resources/variants/ultimaker_s5_bb0.8.inst.cfg | 2 +- resources/variants/ultimaker_s5_bb04.inst.cfg | 2 +- resources/variants/ultimaker_s5_cc06.inst.cfg | 2 +- resources/variants/ultimaker_s5_glass.inst.cfg | 2 +- 1151 files changed, 1151 insertions(+), 1151 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py index 60b5494f84..0c1bb55985 100644 --- a/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py @@ -10,7 +10,7 @@ definition = creality_cr10s [metadata] type = definition_changes -setting_version = 10 +setting_version = 11 [values] %s diff --git a/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index b41f636e63..a9092bb48e 100644 --- a/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index b3d58c0df9..a1d50aae0f 100644 --- a/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index c85b3fce0e..26c5029924 100644 --- a/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 8095a53141..da6cb7f4e1 100644 --- a/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 1f38e12c42..63aa092cf1 100644 --- a/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index e529ff7656..82fe5e807b 100644 --- a/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index edae808491..16473bdcc5 100644 --- a/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 8c6727bdb0..865c53e4e8 100644 --- a/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index dd64f3f185..36150f18a3 100644 --- a/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index f627fbf74b..74d97c9d75 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index be622d6cfe..6aed5bf11a 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 352c26d312..a141830f80 100644 --- a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 553a68201d..8ae79652e2 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 0943bb2032..d814866d39 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 053b849aff..b22b6ff4c2 100644 --- a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 458b283dd8..37efd33670 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = smooth quality_type = draft diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index d19ad53fae..57ab6a727e 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 23d8b1e39b..a5f878bf4f 100644 --- a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent intent_category = engineering quality_type = normal diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index b975628e11..7a77b774df 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 55fde0e4f9..c25de5c537 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index 7ecd48919b..1f3048b29d 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index 08d0696860..31e4eeffeb 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index c3375f12a6..d35f1c6894 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index f18e38f468..dd5f313197 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg index 3d66e6a212..ee15d6673f 100644 --- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg index 9804541e1f..04ac68504d 100644 --- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_titan [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg index 163797dff4..110ae871c6 100644 --- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg index d006c5d47b..c0315f62eb 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg index 9965525d59..c582d60d61 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg index 96655e7b0f..4a2c13567a 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg index 13716895a5..f6ac787217 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg index 7801e1462b..8a56222e65 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg index c97b5fa0d6..9c951ce762 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg index f878a78bc2..f8df4e42c9 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg index eb867e9898..3c378ebe3c 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg index 47bf46ffd0..c911f1398f 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg index d26f8a7eba..9d6fcd0159 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg index 4299c74820..67dbe2c33b 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg index dfc6bbc8ae..5f79e3b1c4 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg index 70549350ef..9485e432a2 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg index 5d4fe3f047..b8027fdecf 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg index 16a7132b02..6a7472d2a2 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index 0789dd5837..1b0bf92b9e 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_chiron [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index 53027f220c..51a8ec246e 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_chiron [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index fedbac5a1c..f832ad2bfc 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_chiron [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index 868c0a088e..e074a343c2 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_i3_mega [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index 6c7eb77fac..c9685ab931 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_i3_mega [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index d4d578d4cb..a9753a1561 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_i3_mega [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg index 42e658333e..2d0c635852 100644 --- a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg index cefd8d6b0a..c339ab8635 100644 --- a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg index e087a95b96..b2f7ee110e 100644 --- a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg index 580b296860..3320881118 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg index 8cefa3a69d..64a7b24845 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg index 718b4e7c26..943b681ef7 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg index fbf9ababf9..f2bf753bb5 100644 --- a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg index 16515f76a9..8f95778897 100644 --- a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg index cb3b0a7adb..2198e044ab 100644 --- a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg index 7d4a0247fa..fdf625a655 100644 --- a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg index 391174b1f2..2efcb6595a 100644 --- a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg index ac6ca153b4..a7f762bfc3 100644 --- a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg index dd111f5958..fbb5eff2c8 100644 --- a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg index 28cdd75af6..fa441ac94c 100644 --- a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg index b4bf76d3ef..d6549156e9 100644 --- a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg index ab3cd5f97c..0997984d3a 100644 --- a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg index b30e902e99..b1527bf254 100644 --- a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg index f8272e1aa6..292fe634d1 100644 --- a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index b919c0f74f..5be6734287 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index 7232de4e4e..572f829caa 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 5c9efabda7..c0325ada1d 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 2b48f4d213..59d871badb 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index dfc2f61659..906e8997f1 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index ce0b49d016..38b0102316 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index 1028df1210..3e694f43a7 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 6aed341c87..c09d0057f6 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 90c2b26490..7a85fb360f 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index b3a51a71fa..f3b22dbb71 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg index c47cfd8a98..66dce8e80e 100644 --- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg index d15d00d1f4..75d1e7f572 100644 --- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg index dd41219d64..cae99c4561 100644 --- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg index 244f0ca147..4fe2f4528e 100644 --- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index 71edea47d1..333edae311 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index b77d4ee730..66c9fd49b6 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index a7482e50b2..8d53e056f7 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index 7064d34ae1..d72478c605 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index 28a0faee3b..8877a4185f 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 0b1e060a42..408ab6fc9e 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index 9a7df57f76..903864abd0 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index 48e61387d0..3f70a9ecbb 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index 39eda78f37..11c9bd1490 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index b6655bf6ac..ed82427d6c 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index b444618d43..c1d906d91d 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index 3dbeb498d8..9884794c2d 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index 5f95a7a049..68cf7b8c05 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index dea47eb923..4b5daed2a7 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index e72ccd529f..ec1443d141 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 7a37916357..97404677b6 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 04b6832974..f6fe7af29a 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 2a75d4a716..4b485385f4 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index d038937fb4..8d928ef5de 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index 701ecc115f..995e2c1ad2 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 6721d6dc96..6000a44e1b 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index 3228949fe5..3fc5b6d33d 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index 5b5894f8e8..2da5e8bfdc 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index f62ddc947e..47eee4eaa2 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 2e755ac25d..a82a1e9c25 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index 0f70febcc2..bb3f0a2f02 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index ad6933bfac..3d96fb7fe7 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index cac3dbca16..2ac45f20a1 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index 7eeb544314..c125cd71c1 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index 15b87d513b..2884a2d79a 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 966cac8e2f..19a769d66e 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index 0bf96f083b..2cf627e3aa 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index 6fefd1eb64..c7e3458b1c 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 8a9131edf5..aeb467a389 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 0c66584e80..432673e77f 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index 6e790bc1c1..7ff698a9e0 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index 3136f27a62..77d4f75c07 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index c2f80ae30d..05e3d4d410 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index 648b34d05c..5be7b83325 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 1d1b697c6b..be66a80508 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index b7c8ff5291..d37f16363e 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 8cb38eb36a..8535a12010 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index b06d646eca..257be4b88f 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index a40f56ed48..7cb6d951dd 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 05a5a9521c..e5e495fa24 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index 65982c8085..5b732a5f9c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 344868276b..27d833c07b 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index b0cc949d2d..24fcc1a6f1 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg index 1d68ca93af..aa8773035e 100644 --- a/resources/quality/coarse.inst.cfg +++ b/resources/quality/coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg index 866f7a38c5..2761d80a3b 100644 --- a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg index a17ead7619..9adae73117 100644 --- a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg index 4d583e8297..5bbf86e13d 100644 --- a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg index 2cd3ca81a6..0f28668117 100644 --- a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg index 5121fde104..ac7000bdbc 100644 --- a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg index 0ff4f900a6..63fdbad197 100644 --- a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg index 93bcfb6a94..34176fd865 100644 --- a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg index 0c171dbe8f..58a5048f64 100644 --- a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg index 1dfa94777e..b28f044b68 100644 --- a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg index dbe3b2f2ed..94d4231350 100644 --- a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg index e36587e18d..c060e81938 100644 --- a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg index 16bfd42486..ac6ab13ac1 100644 --- a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg index ba1f772400..43da465ffe 100644 --- a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg index ea413ae19a..9981b20687 100644 --- a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg index 002967d7a7..d4e62ee1cd 100644 --- a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg index f2d98137a7..2dcb61972a 100644 --- a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg index a8bbd71d89..f8c6c99e3e 100644 --- a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg index 9d10e6512a..cdbb863f7d 100644 --- a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg index 93deb58aa7..93447302d3 100644 --- a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg index 3311cd309a..b05453a64f 100644 --- a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg index ef0a275474..97bd2845c6 100644 --- a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg index bddaac624e..4392bbe3f3 100644 --- a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg index f064cd7395..d5f86c18cc 100644 --- a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg index b3adb0fa35..b47723ec11 100644 --- a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg index 6cebb415ea..70eb255c0f 100644 --- a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg index fd9f1daaf8..0b2c4da236 100644 --- a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg index 7b0480ac5f..8956895f85 100644 --- a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg index a2ebc522b7..99b0bd7ee5 100644 --- a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg index 182d681e8c..d752fa0ef2 100644 --- a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg index 238ab3c2b8..ddd42a4260 100644 --- a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg index da84b3115d..b5f9264ff0 100644 --- a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg index 3141a28f38..d78d535227 100644 --- a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg index 65bbed31f2..676ed7a216 100644 --- a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg index 467a530878..a83e0bedd3 100644 --- a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg index 8e623e67b5..db18ba1443 100644 --- a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg index abf1714251..fd622c1f92 100644 --- a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg index 384f182ebe..2c340d9d92 100644 --- a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg index e7fbe50ff4..4b22ac0a5d 100644 --- a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg index d24eb2b7f8..e7fbd03267 100644 --- a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg index 1705611dc2..db979b662b 100644 --- a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg index 1e369ab79d..de8a7da619 100644 --- a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg index 69401e5903..94e5487214 100644 --- a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg index 55783954a4..717e730da2 100644 --- a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg index d61bfa0b89..f3b6c77b10 100644 --- a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg index 8784ff1e61..7d07b661e3 100644 --- a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg index 93adb3d881..e26c461823 100644 --- a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg index 38664d876a..f89b45a7cc 100644 --- a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg index 49ddb00090..e030dc8d05 100644 --- a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg index 8c3831a06d..df2b7303f5 100644 --- a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg index 5a2e73d7f0..447aadd7b9 100644 --- a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg index fe1b11ccab..438ba87bcb 100644 --- a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg index 856883153c..963bafb0f0 100644 --- a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg index b4d8142b48..b733293915 100644 --- a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg index 94c0471d18..2a12ca9c08 100644 --- a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg index e916b7a0fd..8674d629df 100644 --- a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg index 007478277f..36f7f8a61a 100644 --- a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg index 8cdf0afac0..0874c1285f 100644 --- a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg index 23a9a6dfb6..102a6d1298 100644 --- a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg index 8090d45bd2..2581a6dcd6 100644 --- a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg index afc92ab32f..5924b437b4 100644 --- a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg index 694fc9a0a8..277f8416d9 100644 --- a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg index 5aeee9302f..b0a95e42d8 100644 --- a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg index ac1cf05f9b..85d7843621 100644 --- a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg index dd293a7585..a1b8aa1a50 100644 --- a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg index 6f3276085f..fdb4aef0e4 100644 --- a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_global_adaptive.inst.cfg b/resources/quality/creality/base/base_global_adaptive.inst.cfg index 9372dd97a1..1dce93c37e 100644 --- a/resources/quality/creality/base/base_global_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/creality/base/base_global_draft.inst.cfg b/resources/quality/creality/base/base_global_draft.inst.cfg index 156ff0bb53..e294213853 100644 --- a/resources/quality/creality/base/base_global_draft.inst.cfg +++ b/resources/quality/creality/base/base_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/creality/base/base_global_low.inst.cfg b/resources/quality/creality/base/base_global_low.inst.cfg index 47f621ae73..4129669e2e 100644 --- a/resources/quality/creality/base/base_global_low.inst.cfg +++ b/resources/quality/creality/base/base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = low weight = -4 diff --git a/resources/quality/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg index c498b5b7db..bd60933d28 100644 --- a/resources/quality/creality/base/base_global_standard.inst.cfg +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/creality/base/base_global_super.inst.cfg b/resources/quality/creality/base/base_global_super.inst.cfg index ae44762626..ed40dfb7eb 100644 --- a/resources/quality/creality/base/base_global_super.inst.cfg +++ b/resources/quality/creality/base/base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = super weight = -1 diff --git a/resources/quality/creality/base/base_global_ultra.inst.cfg b/resources/quality/creality/base/base_global_ultra.inst.cfg index 6f4d8797ba..7f608256fb 100644 --- a/resources/quality/creality/base/base_global_ultra.inst.cfg +++ b/resources/quality/creality/base/base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index e0edca4275..9963cb3acd 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 4f2b31a819..954b804dd4 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 71117230b4..8dd6db539b 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_global_fast.inst.cfg b/resources/quality/dagoma/dagoma_global_fast.inst.cfg index 8ed08f69fb..93057f6803 100644 --- a/resources/quality/dagoma/dagoma_global_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_global_fine.inst.cfg b/resources/quality/dagoma/dagoma_global_fine.inst.cfg index 7f6fc41a33..32db1de5c7 100644 --- a/resources/quality/dagoma/dagoma_global_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_global_standard.inst.cfg b/resources/quality/dagoma/dagoma_global_standard.inst.cfg index 7c9bc4c12e..2ccfb6d406 100644 --- a/resources/quality/dagoma/dagoma_global_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index 563aa1556c..91fa81ba7c 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_magis [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index b25ec2d714..1e135166b0 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_magis [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 5d2611d20c..297f21f9f1 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_magis [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 1cc9faddbb..7be90b9db3 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 3c87cd672f..e5cc46fb9a 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 81d230d038..6b96244f6f 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg index 1d02afbb12..ecc3cd7f31 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast (beta) definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg index e6964a9c38..1560db980f 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal (beta) definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg index 1e122045c2..8daad9dc98 100755 --- a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine (beta) definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg index 6e123740ab..e70231fa98 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine (beta) definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg index a94dd97b50..eba9a4f24d 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast (beta) definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg index 8580b58217..0ccde62e0e 100755 --- a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg index 4c1b266b5a..fb38bad012 100755 --- a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg index d2ee402ea9..6abfa29a9f 100755 --- a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg index ecfeaa7369..9e16095828 100755 --- a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg index 411d3395fe..0d5e277e7e 100755 --- a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg index f4422cb9cc..323a806c91 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg index 8b7911dbd3..1ceec59cf5 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg index 7f2a9f4029..c718605590 100644 --- a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg index d7392dbe30..ad0a208baa 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg index e4a3b9de4b..e20570f73a 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg index 9f1125557f..237b6a170e 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg index e0ab33459d..cc88448304 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg index 71926d3123..4589258966 100755 --- a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg index 3fdd9555a0..6d7e79941c 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg index 3d338892a8..785631454b 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg index bd717a95f5..18c9162995 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg index 7cd970b1e2..de34ca53e3 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg index 4f0de85125..c666e4f97c 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg index 33af4c368b..4dee4aae93 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg index 8dfc1226f2..31d552af6f 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg index 517037e1f6..cd7a1056e4 100644 --- a/resources/quality/draft.inst.cfg +++ b/resources/quality/draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg index fd11ebce5f..dd82d59dc7 100644 --- a/resources/quality/extra_coarse.inst.cfg +++ b/resources/quality/extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/extra_fast.inst.cfg b/resources/quality/extra_fast.inst.cfg index 5ed73ad867..5ff8ce1ab8 100644 --- a/resources/quality/extra_fast.inst.cfg +++ b/resources/quality/extra_fast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index a5627610c4..bb77b3216d 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index c0caeb3437..2ceb67d078 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index c425c874ce..db24da7cef 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index 6afab75165..d2dd6cd693 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = fabtotum [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index 08bf81bac5..6e19cda49e 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fabtotum [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index 3936d38d3b..a3c79b6ce3 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fabtotum [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index 23235f5e16..b47dc680ce 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index 55669eca85..9aefce5883 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index a1443e4b8c..e0693501ae 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index b07b182d24..601d70bd99 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality [metadata] type = quality -setting_version = 10 +setting_version = 11 material = generic_tpu quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 611cefb3c5..6f43a69703 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -5,7 +5,7 @@ name = High Quality [metadata] type = quality -setting_version = 10 +setting_version = 11 material = generic_tpu quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index 99fb7db62b..fedf9896be 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -5,7 +5,7 @@ name = Normal Quality [metadata] type = quality -setting_version = 10 +setting_version = 11 material = generic_tpu quality_type = normal weight = 0 diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg index f881832356..14a4d92839 100644 --- a/resources/quality/fast.inst.cfg +++ b/resources/quality/fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 4fb63a7cd6..41951e7f5f 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Normal Layers definition = gmax15plus_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index 15454d383a..cb67f784ad 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index 8bd446e63a..ca5dea0aeb 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thin Layers definition = gmax15plus_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index c186684944..d27b117842 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Very Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg index 3340696664..7fec142569 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Normal Layers definition = gmax15plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg index 4681dbd659..93d7fb211b 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thick Layers definition = gmax15plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg index d310b44878..f226e3602d 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thin Layers definition = gmax15plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg index 908e90fe15..ebd4af6f80 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Very Thick Layers definition = gmax15plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index 30e2b47c07..d705a71fb6 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg index 62d3ceaf21..8d154bfc24 100644 --- a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg index 4f99b136b8..1474c518d7 100644 --- a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg index 4dbefdadea..c7b91a0809 100644 --- a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg index 551978870e..aeeccf9da9 100644 --- a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg index 3952acec60..d4e4b9ac3d 100644 --- a/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg index 897209b098..d1ae12c6db 100644 --- a/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg index 53630ffd84..253822d2b1 100644 --- a/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg index 0c051bd0be..243e144475 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg index 95e51dee0b..be9a0a7ab5 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg index 7aa8c122ee..f17054be89 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg index fa0ec0a16b..4a2acb9194 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg index 7e08040eae..894d5f9b80 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg index c29b468b49..6baa26ba95 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg index 2742f86f31..27761cf5f6 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index cc4f3de913..572ac9faf5 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 48111629d0..b9ee4a7ff6 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index 9827a272c0..ba645b29ae 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index 6c882498bd..8f88311c0f 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg index 423e2d0987..8ac8944f88 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg index 7c058ac68a..5e41452863 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg index d8c2f46e59..d06d3b23a2 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg index a20fe163d0..6b286623bb 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg index 2f8286c1b8..4b998dc356 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg index db32843e2c..d4d18f8f65 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg index 2727007967..7f0a6b9ec5 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index 90768577f3..ddbbe9c585 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index e447bc79fd..70975ee918 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index afd6b5f06c..99c782dd72 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index f2e109909d..bf01f11518 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg index 322cb7481c..bb1769f8c6 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg index 326049b02b..55db029539 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg index ea93a2931b..362cc83504 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg index 8bb74c3dae..de39e22ab0 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg index b14647fb95..c929956b8f 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg index 497d45efa2..652341a51f 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg index e305dc760b..3aae302798 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg index 3be1fb2883..988904aa87 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg index f3462ef32a..3c133a8127 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg index 95cd03ab29..9973e5102f 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg index e98449db9c..bb405075de 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_gama [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg index 10645593dc..74af116d16 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_gama [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg index 8432a9ead9..1afe2ba8c0 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_gama [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg index c8e17a772d..4637bf63f6 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_gama [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg index 9a234a59cc..c3f64faa95 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_gama [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 0b9289b042..785dfe8df7 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = key3d_tyro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = best weight = 1 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 7ab9776b4e..8decbb2292 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = key3d_tyro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 7ed3791edc..84ea275cb4 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = key3d_tyro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg index eb4c97cf27..25481ea7fa 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg index 44b09f9547..849e9a8e14 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg index 898e4eda11..cd301fa6d1 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg index 80fac2dffe..df2bfb7c5f 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg index ac135f6bf1..f895959d5f 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg index b93ed65fe4..bece1ed372 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg index 3fa7d76b0a..7001036579 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg index 07f0ed7898..254b3417d3 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg index 0f685ab4ab..268ae42078 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg index 6d8f228c2c..d80d8f7729 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg index e35f68a495..a3a32d2b94 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg index 32e2246ecf..21c366e594 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg index 776b240c21..1a4f548493 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg index 8c86bc7a42..c2e61810fe 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg index 76bc0e962e..26e50780e0 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg index f7194347a5..9c0d1b2b5a 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg index ae3de2e5b4..2d29520e11 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg index d6b338fb43..2f74aa7fd0 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg index 1c3966036b..1687a9c000 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg index 24a4a71292..a4ec754aa4 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg index b44212f2fd..a63eb6ff14 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg index 6ed2d68813..78619554f4 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg index 436d4750f1..d33000b5a5 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg index dd2af59f56..b812efe72f 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg index 8cccd0d887..41515712b9 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg index b3941891b7..3cf3b16ddf 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg index c901bed90e..7eb8e0c243 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg index 9196423af0..211a9a468d 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg index d415ea159c..c5a40f6aaf 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg index 7533aeca55..6c0ae88c8f 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg index c98b98695e..ecea3ff7dc 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg index b1983e11af..da8ab26e59 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg index 5703ed70ba..be7fcfe2fd 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg index 61f721bc6e..39b9681972 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg index f482c167d0..803a8ee4fb 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg index e1b75f9735..a58f96973e 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg index 9ebdd4fe40..c489268671 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg index 91a87bb0cd..ed3923dc6d 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg index 1209095246..8ee848931e 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg index 5f8d7e964d..3216bb5d43 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg index 48977d2631..cb1fb5410f 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg index 23a7a91006..17907c13d9 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg index 7fc15ac57e..4abd8e1ead 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg index 3d8138452a..d96cc66962 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg index f34136d4bd..5196ab1d89 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg index 0c852fa4d9..0668bba438 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg index ab23462d6e..461e5e8d18 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg index e1189b5c92..28efd14dc9 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg index 0fa5602385..e57e2d88c2 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg index 9956a32d47..d223d7b04c 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg index e022337fd8..6bd2e8a61a 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg index dc49747ff2..2485d59a6f 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg index 98a2f6a13b..0a1bdb4f16 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg index 72495c6975..49d9e3fa00 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg index 57b306426a..ba4ca120d9 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg index 97426a8689..7460d3fc67 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg index 939706e27c..2b7ea859c0 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg index af06b692ae..8c2e0a76c4 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg index 906d0d0c6d..74240d304f 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg index 477135c108..84d2b8c969 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg index 64f1811850..627f56ad70 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg index 6679dbe999..6c06171ff3 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg index d94e228912..a21ad1a661 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg index bd3f404abf..838135b790 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg index 47c439da4e..3ec00f3827 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg index 211e4f780f..880de7b814 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg index 853a17ace9..2a91eaf649 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg index 5b2b0fac23..9ea25f9128 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg index 134bb4d4a1..d8c6d51808 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg index 0094f4d1dc..27bd5f1e09 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg index b990a5d60a..ed3a7040a2 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg index 7275fb136b..91396af2ae 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg index 04687ec000..c735c1e811 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg index 46c5067b23..e722129cf2 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg index 19c5c6d1d2..b0b9779a7e 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg index 6a68d6110a..fa073e9e37 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg index 46e1797e16..b9cd2baecd 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg index fb54021f50..4c84206b7c 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg index 1b43dcc27f..9c9baf5e3c 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg index fcda0b6bc6..fd3e3dc8a9 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 10 +setting_version = 11 type = quality material = generic_pla weight = 0 diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index fb28bd7310..9c40ea3586 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fdmprinter [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 53649d3742..d5d2b5a3cf 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -5,7 +5,7 @@ name = Best Quality definition = nwa3d_a31 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 320e995fdb..ea98b3df7b 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -4,7 +4,7 @@ name = 0.6 Engineering Quality definition = nwa3d_a31 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = Engineering weight = -2 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index ad35303020..a339d2c401 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality definition = nwa3d_a31 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 7a75896032..ada89f0fd5 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a31 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 47949c5892..0ba0ea8e16 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = nwa3d_a5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 697fafddf9..e431a81667 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = nwa3d_a5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 519b2f2816..e7f37b9e41 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index 5eba875cbb..1264580e62 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = peopoly_moai [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index 105bb5aac3..57a545a620 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = peopoly_moai [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index 9c83be7d63..dd6bb0e1f0 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra High definition = peopoly_moai [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra_high weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 820657ba8b..7b1e383217 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = peopoly_moai [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 2ff1636ee4..9a31c92f03 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = peopoly_moai [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index a3260a32f4..fed7ad0362 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 648ec5520c..1667c220cf 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index e3fe5f49fc..12d2243d22 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index 8482d229ce..c4e7796054 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index fdddcfbdf5..3d011cf07a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index 841c23b837..70df574c33 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index ff541e9c67..446073fd68 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index 291ea81dc8..e5189e4d4d 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index 7afac5304e..7b84cbf6ff 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 19d8247456..5361c7b5f2 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 44e5609b3f..5b7663b802 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index b4cc317f50..7b0be4e0ba 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index eb8bd0a020..8bc91948c3 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index a25f57b3e7..b9c05a9582 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index 6222d946e0..30fd46b4ab 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index 774a985511..f89451a6e7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 72429d945b..5953221cc4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index 09c540498e..091d149ab1 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 7c31ab6b41..58710bfe71 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 67fb9d5dcb..0248d32e7a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index fbe0f733cc..825794fb10 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 517a0d9943..9ae5a43c9e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 0a55c5fef6..5f96163183 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 6128889e8c..dbf10149a2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index af9b874470..5c70ddc959 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index 1ee8fcd291..c1449811d3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 9922045d01..24c8ee9ff3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index f8b58f5600..c38c2a18d8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index a837a8f969..04e0a7394d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index 92cba1ea19..6322f6872f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index a1e04e4789..5d5a76e89c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index e70d84ddd8..005cffdfbd 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index fe9d215acb..811475d645 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index 233ea10e27..2f361a1ddb 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 05ae1383eb..081a686655 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index 7507968a69..481643bc63 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index ea68f30f33..c11cf8384d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index 915e0f3b83..3a97437c8c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index b9c260eb2c..d312e7fc1e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index 7e1237eb55..edd4577e20 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index f5fed6dc2e..8062a98f65 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index 033c0e03bd..427b9d70d2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index 9e457f7d73..62951a316b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index 8d152328ad..2f2698e179 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index 78483d0238..63de3ce548 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index de5110ef46..55c6179f9f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index bf649d61ef..199540d1aa 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 55d6d20323..eb74a90376 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 8c3215ebc1..64f2aadede 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 4a12fffb1e..8bb07e8160 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index a5f01107f8..ae12d4d968 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index 6042de9501..1eb3e3d297 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index 405bc3db13..bc8794b59f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index b52bd3e5a1..9681911e37 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 8b65fa78bd..774500980d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 5cf1c2c5a9..ad663f21d9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index e514ce8425..aaa99b3915 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index 883c733088..a7ccd45c84 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index b7ec8a65db..e6bb7db978 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index fcea53fbe5..44db56fc1a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 61a455827c..3e1ad81cfb 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg index 7f29e29d88..396ac2580a 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -4,7 +4,7 @@ name = H definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = h weight = -1 diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index 69a9bedd9e..2dddad7e25 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index dbfd0c46f6..a08f6788a1 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index e167da5fdb..609a1b76ac 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index b1a00232ed..1496589bbe 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -4,7 +4,7 @@ name = Medium Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index ee2e45b511..a4891e96a7 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index bc1bf264f3..d0093358d9 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = f weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index 634cebecf6..0f479ea02d 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = g weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index ea1a751190..39b60dc75c 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse Quality definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = h weight = 0 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index 58a11be8b5..2095906bb0 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tevo_blackwidow [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index a502f38e24..45e16c8f6b 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tevo_blackwidow [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index 51a497f47b..a516bea4db 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tevo_blackwidow [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg index 2e2a3cce5a..715fef3853 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg index adbb8a8ff4..f9d11d2edf 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg index 9bf480824e..745a01c680 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg index 1aad72859a..e88075ad65 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg index 7329cf25ad..7f5d13685a 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg index fd5ea15ada..336beb7c81 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg index eda120d767..41593c73be 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg index d14f345eba..1550b031d9 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg index 869328e6f1..122db785b2 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg index ee52b976fd..f00b1195b6 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg index ac4816f557..59dec87610 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg index a4f1774544..89ee2fc506 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg index 1469bd4ebe..3673398193 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg index 1d866e53d9..aba14e2456 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg index 95f8d69f97..c37d942cee 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg index 7b8e48c20f..80f627c401 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg index 923f3c6bc5..dc8db6e6b0 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg index 85823d9276..0c3f978ec7 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg index 8fa9f08d41..dce017bf69 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg index 778be27b1c..b51fce46f8 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg index 8e964d532b..58deb98ed6 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg index fa4a7ce2fe..3255b1988d 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg index a893ddc6d0..d87a1eb1b9 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg index e276ddfd80..ed69ca5853 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg index 2a1fb70852..429f324cae 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg index 6d2f668fef..a6b68f71ef 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg index 0e6d0891f5..6a9046dfbe 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg index 80414f8e08..dd4f93de77 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg index a9bdaec137..5c5d66a2d4 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg index af92cfbc1e..6639832138 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg index 2da142083b..648f98e0b6 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg index 6c427a7462..178829c59e 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg index 7fac1c20df..df949c7608 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg index d596e0be91..3915ac4da9 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg index 9759f25c94..12620dfed0 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg index b7fad60c6e..902e35c303 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg index f5ef05d545..a4f968b218 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg index 46ecadc9fd..a3e1d71b7d 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg index ba20657775..9c7b75acf5 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg index 18517fda8f..a4d5a4ca97 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg index 1450ee19a5..d6f24cd98a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg index 3ab9e3d09e..ba77e1c176 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg index a3fb473056..a4b72b28ca 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg index 384f8ce4c9..3d6b9be14c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg index 6bef3afd95..47bb027876 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg index 1e5760e696..d0830ce36d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg index c1fcb2df82..b9da9bb7eb 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg index 81323128a0..15aa5a668c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg index 95dba27ba6..06126999df 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg index 676d7fccf1..dc7ec7c041 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg index 31b70a215a..a25e1ec686 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg index 869a10fc84..ac14f6ead3 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg index 2b6c5f2802..c7935ca08d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg index f595418472..1bd0d898ad 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg index 6627f7ad5d..42899c7bd4 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg index d0c434f952..824b3734ca 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg index f18e030674..bd0eb530b2 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg index a61c7b7265..7dcdcb77e1 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg index d7e6e1239b..3607a7665a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg index 0da222d512..3048d47bb8 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg index 9c66a0ad10..0b1ede986d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg index 2309c52d5e..a6d86d740b 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg index 540b1e626c..ab070ac404 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg index 2cfba4db4a..4627e7ba11 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg index 3b9492443d..f59f44e7b8 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg index aa9ffda827..5ce785d9e8 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg index 94ea7fd6fd..ab921bd8b1 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg index 8019801d70..97117f2f0c 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg index df9ee716e2..e62b244a5f 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg index 96ee57154e..e586f673a7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg index bf21301a3a..b6e44fbb6b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg index 22a868aa35..d14e24e025 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg index 379630d69b..42955af482 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg index 89b0b8430c..1a704f0afd 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg index f692c83267..5aa9062813 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg index fc6fd386d1..ded1436eb0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg index 480c98afd2..d5cf141bb3 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg index 573a474625..83d2b2991a 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg index 6781558772..328578e51c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg index 3876de89db..7e45c7ce40 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg index e7ba96affc..1434496ea3 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg index 3f4b72f6b8..8c47258ade 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg index 82466932e1..aa7c5696b8 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg index 001808cb0b..91a63416bf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg index 48a9247e75..a712eddc43 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg index 6e17c6a6b5..cb9d2eb965 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg index bdfc1c3686..e35606b039 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg index cdf652a733..a0aec72143 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg index 03b9a4719f..70981c0dbf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg index d0aa7de952..caf360e2a7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg index 0e17655de0..ffcfa69bcf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg index 60b14a5f7a..72106f3e17 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg index c75f2cca4d..a4c371a444 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg index d47fbef04b..e7297bf3ca 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg index abfc316453..8aa2016d38 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg index d3c7ad84d1..b93e3b8d93 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg index 34d66ff7de..2af5836864 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg index 585205b8bb..17fe67aebf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg index 1828fb55f8..f8d8d32be4 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg index e578647355..a33ddab225 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index 0505c641e7..cd0a9e24c9 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index 8a00b03d20..ff62bfff48 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index e4dd05c2af..f69a6f272d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index 128aeef211..8d8c016991 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg index ef31e9482e..e7382081ce 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = draft -setting_version = 10 +setting_version = 11 type = quality global_quality = True diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg index ec6e78b65f..1f8cf0cf57 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = normal -setting_version = 10 +setting_version = 11 type = quality global_quality = True diff --git a/resources/quality/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg index eac29a7f37..5d204ad6c8 100644 --- a/resources/quality/ultimaker2/um2_draft.inst.cfg +++ b/resources/quality/ultimaker2/um2_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index 3ed5d7fce7..5acafb8944 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index 36bd437dd4..d6f830154e 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index 9bf5fefa81..cdea639581 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index 70d2117568..413f4d7702 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index 74d6a053a5..94074f291c 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index 52b8d1968b..78c39509c1 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index 7f9d854245..fd7b54f99f 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index a52f3a7eaa..d29242d8a6 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index 7fa5be1218..68dac9be64 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index 36b0b64012..2b2cc4ce46 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index 4794f9a743..746c9c5840 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index 90c46693e4..68f73aae10 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index b675412d66..4863ef4545 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index b485a004f4..9a99c1cd45 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index 71df0dee8b..b69ab9ac8f 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index 6c6b9335e8..187be43c5d 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index 139c0aca83..f74b587abe 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index ad4473bb66..e6542ca6a4 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index f418184c4e..ae6440eecc 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index b667889c1b..91f961a00a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 741ce4c235..85f62ad167 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index d9e5cc3aa6..066b5f4201 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 1164125b62..826aa6c719 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index aba3008932..56a57ca6a7 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index 0900da01d0..235f89d110 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index e487097807..8c6529e5f1 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index 9c68b17d71..06fe250c8b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index 9d9912c433..9359fd513c 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index 685b75b27e..51abb6bded 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index 5be0c1cd31..fb79676eab 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extracoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg index 37ba437cfe..33e8f76f4c 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg index 29c9cb1626..d9c818efa0 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg index df50568401..52231dff2a 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg index 6ef155e81d..a43bc002a7 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 744fe1894c..add3690889 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index 96819d6328..36604404b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index a3cc6ada9f..f059cbcfc4 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index e53ccbe9b0..789bacc98b 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index ddb89bdce1..2bd0449056 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index d8734ebacf..2730eb0a10 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index f472a733ed..06c4c322b5 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index 1cb7df97fe..6c85e3e016 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index 2360a3231b..7c5fbc1327 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 7f00f1f1b1..87ba3e4ea5 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 4c8c5ce3bf..b85fc8d3ff 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 290cc51900..3b314652f6 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index 7f5825b868..152932aaab 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index cc3b91e406..578b7ca970 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 04b4fee95e..3158c79215 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extracoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index f8ea439de1..a3a349e20e 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 160a3fc60f..fb9423cd5d 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index bcc6a8474c..dd5c1facf9 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index a83f565043..07532c8684 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index 44336d5bed..eb4c8d648b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index 22caf19fb6..7d85dd3f2d 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index 0b2962cf0d..1dddebe52e 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = slightlycoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 24526ead4a..4a659118b1 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index e54f936f67..745c9e3057 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 0369b1fe47..a5e5d3e563 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg index 0ed746ef26..c234b2eab7 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index db9ce515cb..d95e6c38d8 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg index 7e0c63e2dc..1020c5c0c0 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index 0f8aebcb82..cd8ea78856 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg index 310c0dd7c7..b57b3b12f6 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index 81c74aaba6..c0d17827ef 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index 0cc06b791c..480b807b39 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index 3e0032cb9f..f5e27c3773 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index 6ed89e92f0..a392bd078f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index 237f8b2195..7705e1e456 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index b6053cab3a..679866fcbd 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index af6bcabe3c..7a241cb1df 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index b2473e84ad..7780c8a77d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index fe74184e93..c516a9c8c8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 6e8125a47b..52a9aa0ae2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index d92dcee5ef..d1e0be55ce 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index f9d9270d42..2d7b4e3546 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 23b54f2d6f..efa613a1b6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index 11631f1783..69323dbea1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index b45973dca2..1299e53e48 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index 48c225adf9..a5a6af1345 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index 9c335fae88..a0bc0d4798 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg index 424e888980..37c533eeb6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg index cc12cd8f47..f0551cc600 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg index 6bf8b2c6ce..7d84ba00d9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg index a876f0ccc6..48aab6f43b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index 9c5787429b..a71d0082ce 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 7623235d28..2b2f354c34 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 7114045a7f..4f589780a2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index 0122914330..d6b5ad0a09 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index e26fc9400d..e720379c7f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index b4ce5c3ad1..db8836e5c0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index d9fa672e19..4cdc312bc0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index ca21917b84..a1c7f2b052 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index b018f2c8c1..ac7a8a89ac 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index 48013bff77..06067b0e23 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index 1fe7c7f251..530f808781 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index f68eb02be0..6352c0ed6c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 6b3527b2c9..e0f4555542 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index b383fde2e7..35c913b632 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index d3af9e7ee0..9e5cff3bb8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 054d4a38e4..a992a45fa1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index c4b0e7883c..d3516ddbbe 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg index 957bb0142e..e7fe9b9806 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg index ea24b21e27..8f0cabd172 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg index e566c87e93..9fbcb71400 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index 44d3af4a26..bc3753ccbb 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 0b28a03dd7..eaf9a6a1be 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 077d0aab45..caf848d3b8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index 07f506e019..f4c88589ea 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index ae080455de..d247a83ada 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index e7141d77ff..7b2ea92d15 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index 0f2e3c777c..650cc6f9df 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 3f5ad363d9..1a478c059d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index ebc02f09f7..eab56a450f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 10104d5aff..b88d4e8ead 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg index 0eeb9de984..b11159c1da 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index 25a560fa8c..ae94345be3 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index 2d6d112e95..b440194ec4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index e714ed4753..c1e3b8c676 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index 3893990f67..7a2dd4c5e8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 70f5c9c9cf..ecba4281cf 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index c06affc4e1..d347234919 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 81532dfcbc..54f1852a40 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index 6c5d3baec2..ea4dcf5080 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 30e6cb7116..d7c9b1d9b0 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 86f6965eb4..9aa048bef6 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index 9261ecc689..d5f2c0f07e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index e9e111fa47..c14469f466 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 904ffc0854..b051efa442 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index 81c570ec52..ba8cc414bf 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 8a8f0efcd2..31e2d91748 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index ab67537b80..fc7932fa59 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index c7f41acd06..6c26838173 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 99a7af36f2..a8a79c0c17 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index a6a5ac1a4b..1d5fad0050 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index 24b0f7ba0e..623c7e3b26 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg index 0b9c1d5a61..06c764547c 100644 --- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index 3f470ebaaa..b2fc9ce2fb 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 28d16285e8..91e505486e 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index d270ad94b3..464d7141cd 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg index b1f3750420..d1be77e8be 100644 --- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg index a567173956..f398364bc2 100644 --- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 721d867161..248cd595c0 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index 3ddb8bf467..9ea0b4314f 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 31558a9ab7..d77dba8678 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg index 2cf4d85d27..d446fda6a1 100644 --- a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index cf18a6e9b2..6f2add164b 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg index 6820c1cf16..07832b5d21 100644 --- a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_original [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg index d1b20176fe..56b1f0d5d7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg index 8a0a8b2e9f..dd4dc55af8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index e52512a10d..00b4eb77e8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index 29d5e50455..c414f76f8c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index 5596bb1d33..ac5e475d96 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index 3b9bfa3e3c..f3a67dfef4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index 8d2f6092b1..b27ae99a44 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index 6e5912c1a7..baa277c543 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index e8fda946e2..fda1c9ee96 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index a3c1e88495..b65479ab74 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index 015c8d05e9..d4215be488 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 310e866ce4..eab9ac6fe5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 6cac452a29..582c51456b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index a22960d99e..7f3bfba927 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 38be6a344e..3af449ee69 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index be84f05a70..7f553837a9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index e06e5b7a08..b311bce56b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index 4f0e371ded..41db72ae39 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 97d34cdb88..ff8c914e34 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index 1949a0f410..fda0cad78a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index eb079b5852..4b438a1b41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 3c308a5738..e35e75ccb7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 20f4a810a2..264f6dd635 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index ae6d1235dd..e374c67a29 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 1ce5a8b20f..5a3be0a93b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index cacdab09aa..848921881e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg index 7a2f19146a..9a370932de 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index b3157b6b5c..97d217b928 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index febe2623af..974a4b86e3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index 6dc88356d5..a176d8a066 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 8d997b8edf..69c0d0bb23 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 96b243081d..32dce2236e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 6885abae9b..567bd84a76 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 96747f5f0d..522147fdd1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index 38aee9a05d..d8caa2e615 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index 521d24ec8b..bd08a774d2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index 45212bfc28..8bc06272be 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index bb04c3f173..3f2bf71469 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 0d391c8406..9c0f665788 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index c1c465389f..f4223bfb17 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 52551f620c..81ed3df828 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index f97942a9a9..aeee555471 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index e068ab78cc..7b289aa2d2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 66b99612ed..9720978072 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index 4ff8929f24..32b31446c7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index db90eb75eb..ff02568346 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 087506c91d..ada2e19e40 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index 23d4727604..7db7f859f1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index e987d0b55d..15e07be671 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 2dd2219d42..6931956c28 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index a4e20f0054..63a5b8d26b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 9e6a0a2e04..83224c83f4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index ce5e9afcd1..7a66485d16 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index 4eecc8a625..a3bb787d82 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 1bbf002989..4b9a460eff 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 037ef0c808..460504d9b1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index acd9bdc98a..cad3dc4b2f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index e8cc341b36..b3fd93971d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index 9c02969944..c7b6d85efe 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index eb2cb3910c..09e9d72e24 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index 7214f0d404..d1f5851822 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index e7e53f400d..e398a6a9ea 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index a26ff382d8..d129bafb4b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index d8b5d0b576..0977c369bb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index b033ba10fb..93600d1d45 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index ee6da50fc9..3b95a2dffa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 07b4329204..bff567d5fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index b0cee0f130..eca00013da 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 728d7e8900..f13273353d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index 4dbd5b609d..a0a200ef67 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 5d0609850d..25b24721c8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index ed4f25a56d..9085bd2bd9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 3749672b7f..ff8208ab7a 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 87c825b193..40e466c187 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index cb9f9ded57..d6bf539597 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index 84ea35546b..57022cd1f6 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index a868c08920..d5b206a84f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index 6194f236b8..ca945049b2 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 9fc669fa92..8e2963dc25 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index 57ef6fcaa2..dfb810a05c 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index 1d8350e007..fd5d3e6c21 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index dcb5a14928..5b8bce580a 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index 420aed0076..8f5e111425 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index ffafb9fc94..ad2805ddaa 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg index 175bf0b435..32eaabb90e 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 562b3ea77b..0381b00a4d 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 142002eb1e..153667334a 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index f1cc8b52fe..22d477e221 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg index 136f7f85b9..2a56308c00 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg index 149ba68e6b..ec37acd5da 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index 051464c6ee..c55eb1f98e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index a91783aefd..c50c46a195 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index 9ff298214a..e89f0307d5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index b9f469230e..c686973cac 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index c156f3e6b5..a9d336bb48 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 4f1dad43b2..cf43886537 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 1fdee1e826..457274f56a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 40dff3a7ef..6e2110bb0c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index d777592091..e873e83a72 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 53295102fc..90c6a26a2a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 6457e0e3ec..9212424fd0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 34e13ba101..e37bfde09b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index a18bc574eb..1398e26221 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 05cef82f8d..4b40e21243 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 7d31368bed..d02e1a3b3a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index 418ff7836a..cdb5e9fe63 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index 473b03f44b..d993ce239d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index ddcf1dce03..3f638c5324 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index 1fd6231274..1a169e38c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index ee552da3c2..ddf3155693 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 3256ac1fac..2b4ace5cd2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 6267edc26e..bae1113643 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index c935fff0b0..384253f81c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 87ec934e6b..d0ef05dfbd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 1cd175dc6b..275d4d9e99 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 7acd1a02ab..f5ebb0de69 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index a1ff911104..e8315bd643 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 55433e6784..6da61722df 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index 8127b0994d..d8b5b0f25d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index 419d530317..14cba24d92 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 45e501e3a8..1c35efaa96 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 48ae8924eb..0971ef8f17 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index f63085ae99..5c9ba5f36a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index d049bc0cb9..dc16dd2fad 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 826482e541..3a2d552486 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index afa68afab8..2464f03b3d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 7c334e1fbf..8bcf1c41df 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index 71d53a70c4..8679f29273 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index b3cfaff922..3b3ea7fde4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 42722295dd..1681a0cabf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 8958bb144a..60fc8b50d8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index 234556e8a3..03ad0757f7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 0d3e3133b0..dbdaf4ba9b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 2de1bcd2b2..dafa3aec69 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index eded05cfb2..f750cb4010 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index f3fb6ec7b0..9bde0cd927 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index 48a612d57c..5014a09bbc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 2bf9edc3db..a9cf05558a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index a69e813ac6..98b7a6780c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 8f1a865679..15b52dddf4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index e9d099c3b5..4d39177ad7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 9ebf20ed49..d429c9642c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index d8226fcd1f..ab3729b23c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg index 218e916758..6eec90641b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index ac2aace7c0..9314a64c72 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 5c8de50af3..27236b5e27 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index a976218220..71baad0b5e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index f964b085e0..28d3ad20ad 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index b95a89aa13..85d9382cc6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 6fec3f4589..7e391481b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 74d3448cd6..30e5c92c73 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index ddb5fadca1..47a8fac6f1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 73de3a8626..4c0086fda7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 9b5c29adcc..86c9fcf080 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index e8df22484c..cd1597ce46 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index c88a9e6952..e9828faca4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index fd77a356fe..7f0ea9b6f4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 9729e50d88..a797bb1fe8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index b5959ef77e..c1a9412566 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 2f9fe4d401..1480e677b3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 9597911a6b..1a1510b17e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index f4bbe2c169..180565afc1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index a9f16a90fe..df096b5f87 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 1456cfc024..43a1992696 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 73aee41487..3f52afd331 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index aed9b058e5..4a3778d211 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index e6f2ce58f2..b9de83233c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index 853c5109ef..b87082c8db 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index 368243de23..a1862c53bb 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index 3ba8e812b0..61153f7d4b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index 6f3d637fce..5a8f7ed5f8 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index d02bb70c68..388af46060 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 3757863caf..8b864d09ac 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 400c004d1f..f9c8276a78 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg index dd8a4bb853..d2db096e38 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 9f03aeba67..5587b20741 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 3e1a5dd6ad..159b64312a 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index 22616f7e1c..44758ae5a9 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg index 79648c1ad9..1907ca5a68 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg index 5996bd2a0c..89c45641ef 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg index c8462e47dd..a5e22330e1 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg index 952d09114a..574ea34477 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg index d254da6672..98c79fea5c 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg index 42a1dcd801..f9a07db778 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg index 8c1f050a1b..544d32cedf 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg index 7cde2b8d48..4c9d2a0be0 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg index 1b0f8549a8..1fd07d1a65 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg index c4ea9cbd10..a0898fcf8d 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg index cbf1e753df..229fdd1c48 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg index faa8425426..64865959f2 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg index 2b7bd4b57c..cd458e20c4 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg index 9f204106af..7713cf37c1 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg index 2e19a53295..f9407fac25 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg index 09ed702c98..d3b569aa6f 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg index 49ac5fa45f..e1d8f540e4 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg index 54d9c0fe5b..660cde5ed9 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg index decf10a428..28d0031d02 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg index a8f42927ab..6d2edee02c 100644 --- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg index 5f3a7cd252..40c17d371d 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg index 935dc1d127..5a254ee3e9 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg index 9214287bf5..bdc936c193 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg index 528d9b5412..efd7362aab 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg index cfb70fba00..258f20016b 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg index f6fcd371ff..942c610f18 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = normal weight = 0 diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg index 79ea633d5b..420db71e6d 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg index 4bad7d0a07..e877bf0182 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg index f0c1f4ca07..a641f94abd 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg index b62c7e4640..00b89de2a7 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 1f43e8cdb0..13afb97261 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 3449c8931e..e975129722 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 48313f5e41..0e3d1e8e8a 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.2.inst.cfg b/resources/variants/creality_base_0.2.inst.cfg index 3f98c344cd..024024b8b1 100644 --- a/resources/variants/creality_base_0.2.inst.cfg +++ b/resources/variants/creality_base_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.3.inst.cfg b/resources/variants/creality_base_0.3.inst.cfg index 8367f9853c..ecee3b263d 100644 --- a/resources/variants/creality_base_0.3.inst.cfg +++ b/resources/variants/creality_base_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.4.inst.cfg b/resources/variants/creality_base_0.4.inst.cfg index 40eaf4895d..80f98c72a9 100644 --- a/resources/variants/creality_base_0.4.inst.cfg +++ b/resources/variants/creality_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.5.inst.cfg b/resources/variants/creality_base_0.5.inst.cfg index 48da4008e6..d7b497c3fd 100644 --- a/resources/variants/creality_base_0.5.inst.cfg +++ b/resources/variants/creality_base_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.6.inst.cfg b/resources/variants/creality_base_0.6.inst.cfg index 0983c3d4a4..9f2891a500 100644 --- a/resources/variants/creality_base_0.6.inst.cfg +++ b/resources/variants/creality_base_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.8.inst.cfg b/resources/variants/creality_base_0.8.inst.cfg index 31ca8f5a48..83cfe29df9 100644 --- a/resources/variants/creality_base_0.8.inst.cfg +++ b/resources/variants/creality_base_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_1.0.inst.cfg b/resources/variants/creality_base_1.0.inst.cfg index 7177a35ec8..5f33a6f571 100644 --- a/resources/variants/creality_base_1.0.inst.cfg +++ b/resources/variants/creality_base_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.2.inst.cfg b/resources/variants/creality_cr10_0.2.inst.cfg index 3527e6e44b..46a319ab06 100644 --- a/resources/variants/creality_cr10_0.2.inst.cfg +++ b/resources/variants/creality_cr10_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.3.inst.cfg b/resources/variants/creality_cr10_0.3.inst.cfg index ae26fa646d..6515e2cc36 100644 --- a/resources/variants/creality_cr10_0.3.inst.cfg +++ b/resources/variants/creality_cr10_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.4.inst.cfg b/resources/variants/creality_cr10_0.4.inst.cfg index 643908a4a2..5e3ce36692 100644 --- a/resources/variants/creality_cr10_0.4.inst.cfg +++ b/resources/variants/creality_cr10_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.5.inst.cfg b/resources/variants/creality_cr10_0.5.inst.cfg index 155206b4de..0914780a54 100644 --- a/resources/variants/creality_cr10_0.5.inst.cfg +++ b/resources/variants/creality_cr10_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.6.inst.cfg b/resources/variants/creality_cr10_0.6.inst.cfg index 50b7ee8420..2d0d42c518 100644 --- a/resources/variants/creality_cr10_0.6.inst.cfg +++ b/resources/variants/creality_cr10_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.8.inst.cfg b/resources/variants/creality_cr10_0.8.inst.cfg index 9450413cb8..73990c7862 100644 --- a/resources/variants/creality_cr10_0.8.inst.cfg +++ b/resources/variants/creality_cr10_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_1.0.inst.cfg b/resources/variants/creality_cr10_1.0.inst.cfg index 20bf3d0231..6357a40498 100644 --- a/resources/variants/creality_cr10_1.0.inst.cfg +++ b/resources/variants/creality_cr10_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.2.inst.cfg b/resources/variants/creality_cr10max_0.2.inst.cfg index 426d6fdc22..6cc1be53da 100644 --- a/resources/variants/creality_cr10max_0.2.inst.cfg +++ b/resources/variants/creality_cr10max_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.3.inst.cfg b/resources/variants/creality_cr10max_0.3.inst.cfg index 054fd59e09..8e1265f3ab 100644 --- a/resources/variants/creality_cr10max_0.3.inst.cfg +++ b/resources/variants/creality_cr10max_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.4.inst.cfg b/resources/variants/creality_cr10max_0.4.inst.cfg index af0e5ca6e6..b00c8ba4b0 100644 --- a/resources/variants/creality_cr10max_0.4.inst.cfg +++ b/resources/variants/creality_cr10max_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.5.inst.cfg b/resources/variants/creality_cr10max_0.5.inst.cfg index d2c059842a..c00fe00c5c 100644 --- a/resources/variants/creality_cr10max_0.5.inst.cfg +++ b/resources/variants/creality_cr10max_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.6.inst.cfg b/resources/variants/creality_cr10max_0.6.inst.cfg index 63e0b1bd42..97393c357d 100644 --- a/resources/variants/creality_cr10max_0.6.inst.cfg +++ b/resources/variants/creality_cr10max_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.8.inst.cfg b/resources/variants/creality_cr10max_0.8.inst.cfg index 23a0ecd108..54a01e0973 100644 --- a/resources/variants/creality_cr10max_0.8.inst.cfg +++ b/resources/variants/creality_cr10max_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_1.0.inst.cfg b/resources/variants/creality_cr10max_1.0.inst.cfg index a8d9f4db4d..b291b9cd1c 100644 --- a/resources/variants/creality_cr10max_1.0.inst.cfg +++ b/resources/variants/creality_cr10max_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.2.inst.cfg b/resources/variants/creality_cr10mini_0.2.inst.cfg index 637b34b5d5..21a8806881 100644 --- a/resources/variants/creality_cr10mini_0.2.inst.cfg +++ b/resources/variants/creality_cr10mini_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.3.inst.cfg b/resources/variants/creality_cr10mini_0.3.inst.cfg index 834e0d90db..00c079f21e 100644 --- a/resources/variants/creality_cr10mini_0.3.inst.cfg +++ b/resources/variants/creality_cr10mini_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.4.inst.cfg b/resources/variants/creality_cr10mini_0.4.inst.cfg index b2d546924c..69c9d9d09a 100644 --- a/resources/variants/creality_cr10mini_0.4.inst.cfg +++ b/resources/variants/creality_cr10mini_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.5.inst.cfg b/resources/variants/creality_cr10mini_0.5.inst.cfg index 79deae4686..763708080d 100644 --- a/resources/variants/creality_cr10mini_0.5.inst.cfg +++ b/resources/variants/creality_cr10mini_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.6.inst.cfg b/resources/variants/creality_cr10mini_0.6.inst.cfg index 6ba86eee50..6fcb2c06fc 100644 --- a/resources/variants/creality_cr10mini_0.6.inst.cfg +++ b/resources/variants/creality_cr10mini_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.8.inst.cfg b/resources/variants/creality_cr10mini_0.8.inst.cfg index fc406c4d53..d5d3658738 100644 --- a/resources/variants/creality_cr10mini_0.8.inst.cfg +++ b/resources/variants/creality_cr10mini_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_1.0.inst.cfg b/resources/variants/creality_cr10mini_1.0.inst.cfg index ae13e6007e..008b7bc645 100644 --- a/resources/variants/creality_cr10mini_1.0.inst.cfg +++ b/resources/variants/creality_cr10mini_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.2.inst.cfg b/resources/variants/creality_cr10s4_0.2.inst.cfg index 03bd203fc6..779b6133ab 100644 --- a/resources/variants/creality_cr10s4_0.2.inst.cfg +++ b/resources/variants/creality_cr10s4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.3.inst.cfg b/resources/variants/creality_cr10s4_0.3.inst.cfg index 6b18594573..a244c09eba 100644 --- a/resources/variants/creality_cr10s4_0.3.inst.cfg +++ b/resources/variants/creality_cr10s4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.4.inst.cfg b/resources/variants/creality_cr10s4_0.4.inst.cfg index 7d8484b6a3..a92d4a3df4 100644 --- a/resources/variants/creality_cr10s4_0.4.inst.cfg +++ b/resources/variants/creality_cr10s4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.5.inst.cfg b/resources/variants/creality_cr10s4_0.5.inst.cfg index 95348ba9a8..0cc93cff6a 100644 --- a/resources/variants/creality_cr10s4_0.5.inst.cfg +++ b/resources/variants/creality_cr10s4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.6.inst.cfg b/resources/variants/creality_cr10s4_0.6.inst.cfg index a34f8e7822..b0a57972c4 100644 --- a/resources/variants/creality_cr10s4_0.6.inst.cfg +++ b/resources/variants/creality_cr10s4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.8.inst.cfg b/resources/variants/creality_cr10s4_0.8.inst.cfg index 24d9646fac..83b19ba5cb 100644 --- a/resources/variants/creality_cr10s4_0.8.inst.cfg +++ b/resources/variants/creality_cr10s4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_1.0.inst.cfg b/resources/variants/creality_cr10s4_1.0.inst.cfg index 81730c7d32..0b852f22e1 100644 --- a/resources/variants/creality_cr10s4_1.0.inst.cfg +++ b/resources/variants/creality_cr10s4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.2.inst.cfg b/resources/variants/creality_cr10s5_0.2.inst.cfg index 7fc6fe5d25..8e300a1325 100644 --- a/resources/variants/creality_cr10s5_0.2.inst.cfg +++ b/resources/variants/creality_cr10s5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.3.inst.cfg b/resources/variants/creality_cr10s5_0.3.inst.cfg index b9c354ef84..c710a9eefa 100644 --- a/resources/variants/creality_cr10s5_0.3.inst.cfg +++ b/resources/variants/creality_cr10s5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.4.inst.cfg b/resources/variants/creality_cr10s5_0.4.inst.cfg index b17188b249..3827335a8d 100644 --- a/resources/variants/creality_cr10s5_0.4.inst.cfg +++ b/resources/variants/creality_cr10s5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.5.inst.cfg b/resources/variants/creality_cr10s5_0.5.inst.cfg index 539b55464e..8520799dfb 100644 --- a/resources/variants/creality_cr10s5_0.5.inst.cfg +++ b/resources/variants/creality_cr10s5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.6.inst.cfg b/resources/variants/creality_cr10s5_0.6.inst.cfg index baac6bf9c9..c21827ffa7 100644 --- a/resources/variants/creality_cr10s5_0.6.inst.cfg +++ b/resources/variants/creality_cr10s5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.8.inst.cfg b/resources/variants/creality_cr10s5_0.8.inst.cfg index 428e200113..e6676c9240 100644 --- a/resources/variants/creality_cr10s5_0.8.inst.cfg +++ b/resources/variants/creality_cr10s5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_1.0.inst.cfg b/resources/variants/creality_cr10s5_1.0.inst.cfg index aa15d504ac..1c84c1117d 100644 --- a/resources/variants/creality_cr10s5_1.0.inst.cfg +++ b/resources/variants/creality_cr10s5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.2.inst.cfg b/resources/variants/creality_cr10s_0.2.inst.cfg index 1a605cca34..aa01e71be6 100644 --- a/resources/variants/creality_cr10s_0.2.inst.cfg +++ b/resources/variants/creality_cr10s_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.3.inst.cfg b/resources/variants/creality_cr10s_0.3.inst.cfg index 4115dbb199..1ae25762ab 100644 --- a/resources/variants/creality_cr10s_0.3.inst.cfg +++ b/resources/variants/creality_cr10s_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.4.inst.cfg b/resources/variants/creality_cr10s_0.4.inst.cfg index d75b6a8e47..b72d53a8bc 100644 --- a/resources/variants/creality_cr10s_0.4.inst.cfg +++ b/resources/variants/creality_cr10s_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.5.inst.cfg b/resources/variants/creality_cr10s_0.5.inst.cfg index e1bec0a62b..98f222b229 100644 --- a/resources/variants/creality_cr10s_0.5.inst.cfg +++ b/resources/variants/creality_cr10s_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.6.inst.cfg b/resources/variants/creality_cr10s_0.6.inst.cfg index 73ec3c2314..444a107666 100644 --- a/resources/variants/creality_cr10s_0.6.inst.cfg +++ b/resources/variants/creality_cr10s_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.8.inst.cfg b/resources/variants/creality_cr10s_0.8.inst.cfg index 7917b24e4d..9d35763da5 100644 --- a/resources/variants/creality_cr10s_0.8.inst.cfg +++ b/resources/variants/creality_cr10s_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_1.0.inst.cfg b/resources/variants/creality_cr10s_1.0.inst.cfg index fc1b217ba8..47b43b3222 100644 --- a/resources/variants/creality_cr10s_1.0.inst.cfg +++ b/resources/variants/creality_cr10s_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.2.inst.cfg b/resources/variants/creality_cr10spro_0.2.inst.cfg index 0ffded2b21..b0a4a3223d 100644 --- a/resources/variants/creality_cr10spro_0.2.inst.cfg +++ b/resources/variants/creality_cr10spro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.3.inst.cfg b/resources/variants/creality_cr10spro_0.3.inst.cfg index eb3308f1c6..37a20a4455 100644 --- a/resources/variants/creality_cr10spro_0.3.inst.cfg +++ b/resources/variants/creality_cr10spro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.4.inst.cfg b/resources/variants/creality_cr10spro_0.4.inst.cfg index bba3818260..760e9bcdd5 100644 --- a/resources/variants/creality_cr10spro_0.4.inst.cfg +++ b/resources/variants/creality_cr10spro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.5.inst.cfg b/resources/variants/creality_cr10spro_0.5.inst.cfg index e60fbded2d..02b04babac 100644 --- a/resources/variants/creality_cr10spro_0.5.inst.cfg +++ b/resources/variants/creality_cr10spro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.6.inst.cfg b/resources/variants/creality_cr10spro_0.6.inst.cfg index 0912bb7272..ef7cb16379 100644 --- a/resources/variants/creality_cr10spro_0.6.inst.cfg +++ b/resources/variants/creality_cr10spro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.8.inst.cfg b/resources/variants/creality_cr10spro_0.8.inst.cfg index 0e341137de..96577fcb9a 100644 --- a/resources/variants/creality_cr10spro_0.8.inst.cfg +++ b/resources/variants/creality_cr10spro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_1.0.inst.cfg b/resources/variants/creality_cr10spro_1.0.inst.cfg index 42da705c01..1b8a7edd38 100644 --- a/resources/variants/creality_cr10spro_1.0.inst.cfg +++ b/resources/variants/creality_cr10spro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.2.inst.cfg b/resources/variants/creality_cr20_0.2.inst.cfg index 089f494ee8..83ed7d453c 100644 --- a/resources/variants/creality_cr20_0.2.inst.cfg +++ b/resources/variants/creality_cr20_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.3.inst.cfg b/resources/variants/creality_cr20_0.3.inst.cfg index 226767e273..71245ef751 100644 --- a/resources/variants/creality_cr20_0.3.inst.cfg +++ b/resources/variants/creality_cr20_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.4.inst.cfg b/resources/variants/creality_cr20_0.4.inst.cfg index 3c926d7b7a..a467e9db97 100644 --- a/resources/variants/creality_cr20_0.4.inst.cfg +++ b/resources/variants/creality_cr20_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.5.inst.cfg b/resources/variants/creality_cr20_0.5.inst.cfg index 2758eea044..288ff1821f 100644 --- a/resources/variants/creality_cr20_0.5.inst.cfg +++ b/resources/variants/creality_cr20_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.6.inst.cfg b/resources/variants/creality_cr20_0.6.inst.cfg index 3a603c39d6..ebd75a82d7 100644 --- a/resources/variants/creality_cr20_0.6.inst.cfg +++ b/resources/variants/creality_cr20_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.8.inst.cfg b/resources/variants/creality_cr20_0.8.inst.cfg index 948b21325f..9f55c4e8c6 100644 --- a/resources/variants/creality_cr20_0.8.inst.cfg +++ b/resources/variants/creality_cr20_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_1.0.inst.cfg b/resources/variants/creality_cr20_1.0.inst.cfg index 67e5b0f136..a31af91078 100644 --- a/resources/variants/creality_cr20_1.0.inst.cfg +++ b/resources/variants/creality_cr20_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.2.inst.cfg b/resources/variants/creality_cr20pro_0.2.inst.cfg index 19cbd228ab..f54e9cc622 100644 --- a/resources/variants/creality_cr20pro_0.2.inst.cfg +++ b/resources/variants/creality_cr20pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.3.inst.cfg b/resources/variants/creality_cr20pro_0.3.inst.cfg index 967360b908..a915b3365c 100644 --- a/resources/variants/creality_cr20pro_0.3.inst.cfg +++ b/resources/variants/creality_cr20pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.4.inst.cfg b/resources/variants/creality_cr20pro_0.4.inst.cfg index efda313666..16ac215a9d 100644 --- a/resources/variants/creality_cr20pro_0.4.inst.cfg +++ b/resources/variants/creality_cr20pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.5.inst.cfg b/resources/variants/creality_cr20pro_0.5.inst.cfg index 64f84ed545..cd44cec729 100644 --- a/resources/variants/creality_cr20pro_0.5.inst.cfg +++ b/resources/variants/creality_cr20pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.6.inst.cfg b/resources/variants/creality_cr20pro_0.6.inst.cfg index 835ad2a9e0..15b60a94c0 100644 --- a/resources/variants/creality_cr20pro_0.6.inst.cfg +++ b/resources/variants/creality_cr20pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.8.inst.cfg b/resources/variants/creality_cr20pro_0.8.inst.cfg index d7447bbecf..12bcaccab7 100644 --- a/resources/variants/creality_cr20pro_0.8.inst.cfg +++ b/resources/variants/creality_cr20pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_1.0.inst.cfg b/resources/variants/creality_cr20pro_1.0.inst.cfg index 47c7270add..f14431a45f 100644 --- a/resources/variants/creality_cr20pro_1.0.inst.cfg +++ b/resources/variants/creality_cr20pro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.2.inst.cfg b/resources/variants/creality_ender2_0.2.inst.cfg index 8f9373b263..f3b0a6603f 100644 --- a/resources/variants/creality_ender2_0.2.inst.cfg +++ b/resources/variants/creality_ender2_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.3.inst.cfg b/resources/variants/creality_ender2_0.3.inst.cfg index 496dca9ef4..d43c96017d 100644 --- a/resources/variants/creality_ender2_0.3.inst.cfg +++ b/resources/variants/creality_ender2_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.4.inst.cfg b/resources/variants/creality_ender2_0.4.inst.cfg index 0891305806..2e3a1d9215 100644 --- a/resources/variants/creality_ender2_0.4.inst.cfg +++ b/resources/variants/creality_ender2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.5.inst.cfg b/resources/variants/creality_ender2_0.5.inst.cfg index fde911dd24..dc7cefe27a 100644 --- a/resources/variants/creality_ender2_0.5.inst.cfg +++ b/resources/variants/creality_ender2_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.6.inst.cfg b/resources/variants/creality_ender2_0.6.inst.cfg index dcf676920c..fecf5573ad 100644 --- a/resources/variants/creality_ender2_0.6.inst.cfg +++ b/resources/variants/creality_ender2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.8.inst.cfg b/resources/variants/creality_ender2_0.8.inst.cfg index 5532a65f19..2a2aa5001e 100644 --- a/resources/variants/creality_ender2_0.8.inst.cfg +++ b/resources/variants/creality_ender2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_1.0.inst.cfg b/resources/variants/creality_ender2_1.0.inst.cfg index 25f195e41b..5562fbd819 100644 --- a/resources/variants/creality_ender2_1.0.inst.cfg +++ b/resources/variants/creality_ender2_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.2.inst.cfg b/resources/variants/creality_ender3_0.2.inst.cfg index 3cdd7e7c93..ce44646d09 100644 --- a/resources/variants/creality_ender3_0.2.inst.cfg +++ b/resources/variants/creality_ender3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.3.inst.cfg b/resources/variants/creality_ender3_0.3.inst.cfg index 9da7afd758..4ccfc38820 100644 --- a/resources/variants/creality_ender3_0.3.inst.cfg +++ b/resources/variants/creality_ender3_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.4.inst.cfg b/resources/variants/creality_ender3_0.4.inst.cfg index a87c6d77bd..6183845e0f 100644 --- a/resources/variants/creality_ender3_0.4.inst.cfg +++ b/resources/variants/creality_ender3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.5.inst.cfg b/resources/variants/creality_ender3_0.5.inst.cfg index 040502a921..2c4219b51c 100644 --- a/resources/variants/creality_ender3_0.5.inst.cfg +++ b/resources/variants/creality_ender3_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.6.inst.cfg b/resources/variants/creality_ender3_0.6.inst.cfg index d161652a79..429d21db0e 100644 --- a/resources/variants/creality_ender3_0.6.inst.cfg +++ b/resources/variants/creality_ender3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.8.inst.cfg b/resources/variants/creality_ender3_0.8.inst.cfg index ce9947642e..3ccc5e90c1 100644 --- a/resources/variants/creality_ender3_0.8.inst.cfg +++ b/resources/variants/creality_ender3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_1.0.inst.cfg b/resources/variants/creality_ender3_1.0.inst.cfg index cf6c6ed752..feda76917e 100644 --- a/resources/variants/creality_ender3_1.0.inst.cfg +++ b/resources/variants/creality_ender3_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.2.inst.cfg b/resources/variants/creality_ender4_0.2.inst.cfg index f6e7372c1a..42aebf3ad7 100644 --- a/resources/variants/creality_ender4_0.2.inst.cfg +++ b/resources/variants/creality_ender4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.3.inst.cfg b/resources/variants/creality_ender4_0.3.inst.cfg index 644fa86c25..269819366e 100644 --- a/resources/variants/creality_ender4_0.3.inst.cfg +++ b/resources/variants/creality_ender4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.4.inst.cfg b/resources/variants/creality_ender4_0.4.inst.cfg index 1949813c36..8a6bda3495 100644 --- a/resources/variants/creality_ender4_0.4.inst.cfg +++ b/resources/variants/creality_ender4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.5.inst.cfg b/resources/variants/creality_ender4_0.5.inst.cfg index 8b4a83e187..5d5640d510 100644 --- a/resources/variants/creality_ender4_0.5.inst.cfg +++ b/resources/variants/creality_ender4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.6.inst.cfg b/resources/variants/creality_ender4_0.6.inst.cfg index 6961a6d314..28e806b46c 100644 --- a/resources/variants/creality_ender4_0.6.inst.cfg +++ b/resources/variants/creality_ender4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.8.inst.cfg b/resources/variants/creality_ender4_0.8.inst.cfg index 1499efa525..e90adbcfde 100644 --- a/resources/variants/creality_ender4_0.8.inst.cfg +++ b/resources/variants/creality_ender4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_1.0.inst.cfg b/resources/variants/creality_ender4_1.0.inst.cfg index 446907a101..221ddacb83 100644 --- a/resources/variants/creality_ender4_1.0.inst.cfg +++ b/resources/variants/creality_ender4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.2.inst.cfg b/resources/variants/creality_ender5_0.2.inst.cfg index df6f83c34c..4c03104c09 100644 --- a/resources/variants/creality_ender5_0.2.inst.cfg +++ b/resources/variants/creality_ender5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.3.inst.cfg b/resources/variants/creality_ender5_0.3.inst.cfg index 2b44699709..901745dd70 100644 --- a/resources/variants/creality_ender5_0.3.inst.cfg +++ b/resources/variants/creality_ender5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.4.inst.cfg b/resources/variants/creality_ender5_0.4.inst.cfg index f5b4c0f06d..ad071a3b38 100644 --- a/resources/variants/creality_ender5_0.4.inst.cfg +++ b/resources/variants/creality_ender5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.5.inst.cfg b/resources/variants/creality_ender5_0.5.inst.cfg index 773ec1c80d..978eaf61c1 100644 --- a/resources/variants/creality_ender5_0.5.inst.cfg +++ b/resources/variants/creality_ender5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.6.inst.cfg b/resources/variants/creality_ender5_0.6.inst.cfg index e32cb3db8b..57c0e8dda3 100644 --- a/resources/variants/creality_ender5_0.6.inst.cfg +++ b/resources/variants/creality_ender5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.8.inst.cfg b/resources/variants/creality_ender5_0.8.inst.cfg index 329b3f03bc..253dd4374f 100644 --- a/resources/variants/creality_ender5_0.8.inst.cfg +++ b/resources/variants/creality_ender5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_1.0.inst.cfg b/resources/variants/creality_ender5_1.0.inst.cfg index fdbb2bdeaf..140f326557 100644 --- a/resources/variants/creality_ender5_1.0.inst.cfg +++ b/resources/variants/creality_ender5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.2.inst.cfg b/resources/variants/creality_ender5plus_0.2.inst.cfg index 583a5604d2..e07489a22a 100644 --- a/resources/variants/creality_ender5plus_0.2.inst.cfg +++ b/resources/variants/creality_ender5plus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.3.inst.cfg b/resources/variants/creality_ender5plus_0.3.inst.cfg index ae1d33d78b..e6bf5b75b2 100644 --- a/resources/variants/creality_ender5plus_0.3.inst.cfg +++ b/resources/variants/creality_ender5plus_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.4.inst.cfg b/resources/variants/creality_ender5plus_0.4.inst.cfg index 8af2405f93..a18f640415 100644 --- a/resources/variants/creality_ender5plus_0.4.inst.cfg +++ b/resources/variants/creality_ender5plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.5.inst.cfg b/resources/variants/creality_ender5plus_0.5.inst.cfg index 61db41b0b9..cb3e05a82c 100644 --- a/resources/variants/creality_ender5plus_0.5.inst.cfg +++ b/resources/variants/creality_ender5plus_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.6.inst.cfg b/resources/variants/creality_ender5plus_0.6.inst.cfg index 4f9aea34db..6200ab2f5a 100644 --- a/resources/variants/creality_ender5plus_0.6.inst.cfg +++ b/resources/variants/creality_ender5plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.8.inst.cfg b/resources/variants/creality_ender5plus_0.8.inst.cfg index 137bb93253..4366fd59bd 100644 --- a/resources/variants/creality_ender5plus_0.8.inst.cfg +++ b/resources/variants/creality_ender5plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_1.0.inst.cfg b/resources/variants/creality_ender5plus_1.0.inst.cfg index a7aa3a3a49..ff4cc0d25f 100644 --- a/resources/variants/creality_ender5plus_1.0.inst.cfg +++ b/resources/variants/creality_ender5plus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_025_e3d.inst.cfg b/resources/variants/deltacomb_025_e3d.inst.cfg index 1685ddacab..594447cc39 100755 --- a/resources/variants/deltacomb_025_e3d.inst.cfg +++ b/resources/variants/deltacomb_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_040_e3d.inst.cfg b/resources/variants/deltacomb_040_e3d.inst.cfg index e3b1c2c5bb..17deafdaf9 100755 --- a/resources/variants/deltacomb_040_e3d.inst.cfg +++ b/resources/variants/deltacomb_040_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_080_e3d.inst.cfg b/resources/variants/deltacomb_080_e3d.inst.cfg index bd24120ba3..9e94ccd83f 100755 --- a/resources/variants/deltacomb_080_e3d.inst.cfg +++ b/resources/variants/deltacomb_080_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg index 5dff2c12d5..c7d11e4eff 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum_hyb35.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg index ba57935fc6..8e6cd96030 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum_lite04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg index 573cee1af3..46d9c88462 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum_lite06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg index 26f5febec3..c8939cfce4 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum_pro02.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg index a6d9043808..ce3aefbeb2 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum_pro04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg index 8ae1698831..c2a9e29533 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum_pro06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg index 1d5d3d2528..7f32b5eeea 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum_pro08.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/felixpro2_0.25.inst.cfg b/resources/variants/felixpro2_0.25.inst.cfg index 9359da0bc0..ea8dd8ebed 100644 --- a/resources/variants/felixpro2_0.25.inst.cfg +++ b/resources/variants/felixpro2_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.35.inst.cfg b/resources/variants/felixpro2_0.35.inst.cfg index 3572fce149..f580633098 100644 --- a/resources/variants/felixpro2_0.35.inst.cfg +++ b/resources/variants/felixpro2_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.50.inst.cfg b/resources/variants/felixpro2_0.50.inst.cfg index d390d22ba9..5eda1ba795 100644 --- a/resources/variants/felixpro2_0.50.inst.cfg +++ b/resources/variants/felixpro2_0.50.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.70.inst.cfg b/resources/variants/felixpro2_0.70.inst.cfg index 40ca526023..afa97b539a 100644 --- a/resources/variants/felixpro2_0.70.inst.cfg +++ b/resources/variants/felixpro2_0.70.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felixtec4_0.25.inst.cfg index a95f96feea..2993440972 100644 --- a/resources/variants/felixtec4_0.25.inst.cfg +++ b/resources/variants/felixtec4_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felixtec4_0.35.inst.cfg index fadd19bed7..6d9079b637 100644 --- a/resources/variants/felixtec4_0.35.inst.cfg +++ b/resources/variants/felixtec4_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 10 +setting_version = 11 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felixtec4_0.50.inst.cfg index 98bc237c18..6bc04c3224 100644 --- a/resources/variants/felixtec4_0.50.inst.cfg +++ b/resources/variants/felixtec4_0.50.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 10 +setting_version = 11 [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felixtec4_0.70.inst.cfg index 6a731870a9..52057a3be5 100644 --- a/resources/variants/felixtec4_0.70.inst.cfg +++ b/resources/variants/felixtec4_0.70.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 10 +setting_version = 11 [values] machine_nozzle_size = 0.70 diff --git a/resources/variants/gmax15plus_025_e3d.inst.cfg b/resources/variants/gmax15plus_025_e3d.inst.cfg index 4bf7b7765e..a3c590c5ad 100644 --- a/resources/variants/gmax15plus_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_04_e3d.inst.cfg b/resources/variants/gmax15plus_04_e3d.inst.cfg index a4cc8e8db9..60aa600bc6 100644 --- a/resources/variants/gmax15plus_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_e3d.inst.cfg b/resources/variants/gmax15plus_05_e3d.inst.cfg index 0269c03480..7485e9a474 100644 --- a/resources/variants/gmax15plus_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_jhead.inst.cfg b/resources/variants/gmax15plus_05_jhead.inst.cfg index 909cf7386e..4d0f1b1f1b 100644 --- a/resources/variants/gmax15plus_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_06_e3d.inst.cfg b/resources/variants/gmax15plus_06_e3d.inst.cfg index 266b45d25c..a76d867b28 100644 --- a/resources/variants/gmax15plus_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_08_e3d.inst.cfg b/resources/variants/gmax15plus_08_e3d.inst.cfg index 11f5e2f608..bfea83ad11 100644 --- a/resources/variants/gmax15plus_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_10_jhead.inst.cfg b/resources/variants/gmax15plus_10_jhead.inst.cfg index 688add6c34..c9dc51f9dc 100644 --- a/resources/variants/gmax15plus_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_12_e3d.inst.cfg b/resources/variants/gmax15plus_12_e3d.inst.cfg index 357aaed672..671bf00f73 100644 --- a/resources/variants/gmax15plus_12_e3d.inst.cfg +++ b/resources/variants/gmax15plus_12_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg index a04b5cc8be..7303487eb8 100644 --- a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg index facedf04a6..60f66dc3aa 100644 --- a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg index 7d866b19d0..45b1bb15f2 100644 --- a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg index 7824d1dfd8..28dc31a2dc 100644 --- a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg index 1cbc7ecbfc..63bc1358e2 100644 --- a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg index 6756e64862..6f766f0655 100644 --- a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg index 95f347ec0e..6aee101856 100644 --- a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434_0.4tpnozzle.inst.cfg index 20f2ca808a..ffecadd3db 100644 --- a/resources/variants/hms434_0.4tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.4tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434_0.8tpnozzle.inst.cfg index 076412b8bb..903493cc4e 100644 --- a/resources/variants/hms434_0.8tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.8tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg index 2278bd8471..812b6a4dee 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox [metadata] author = IMADE3D -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg index 4220d3d141..c96249ffea 100644 --- a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox_2 [metadata] author = IMADE3D -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d_a31_04.inst.cfg index a18911507f..557b2bd072 100644 --- a/resources/variants/nwa3d_a31_04.inst.cfg +++ b/resources/variants/nwa3d_a31_04.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d_a31_06.inst.cfg index e96ebf2014..1b23b1e1f8 100644 --- a/resources/variants/nwa3d_a31_06.inst.cfg +++ b/resources/variants/nwa3d_a31_06.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg index 29cd075177..c7e9d433db 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg index b4618f2bd8..f8fe060bf3 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index 8b2daab709..38636be20f 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index 06836d8d67..e00d816183 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index 11df55d473..ceb7ade2ed 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index bbf9c14afa..bdc90a417a 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index 6da3a58b8f..58c7ef255b 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index 6e0a9d89e6..8eb4bd0915 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index b5faa591d9..6087e0acdf 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.2.inst.cfg b/resources/variants/tizyx_evy_0.2.inst.cfg index 4b17b4504e..a024784550 100644 --- a/resources/variants/tizyx_evy_0.2.inst.cfg +++ b/resources/variants/tizyx_evy_0.2.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.3.inst.cfg b/resources/variants/tizyx_evy_0.3.inst.cfg index e99fba1f35..4f70be4da8 100644 --- a/resources/variants/tizyx_evy_0.3.inst.cfg +++ b/resources/variants/tizyx_evy_0.3.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.4.inst.cfg b/resources/variants/tizyx_evy_0.4.inst.cfg index bc8b2d4506..9fc644023f 100644 --- a/resources/variants/tizyx_evy_0.4.inst.cfg +++ b/resources/variants/tizyx_evy_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.5.inst.cfg b/resources/variants/tizyx_evy_0.5.inst.cfg index 1b6b543928..0005989cca 100644 --- a/resources/variants/tizyx_evy_0.5.inst.cfg +++ b/resources/variants/tizyx_evy_0.5.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.6.inst.cfg b/resources/variants/tizyx_evy_0.6.inst.cfg index 4b4a7f9bfa..3bd7cff273 100644 --- a/resources/variants/tizyx_evy_0.6.inst.cfg +++ b/resources/variants/tizyx_evy_0.6.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.8.inst.cfg b/resources/variants/tizyx_evy_0.8.inst.cfg index 8f60c8fee8..ac56c46502 100644 --- a/resources/variants/tizyx_evy_0.8.inst.cfg +++ b/resources/variants/tizyx_evy_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_1.0.inst.cfg b/resources/variants/tizyx_evy_1.0.inst.cfg index 000a99da83..1ba55936aa 100644 --- a/resources/variants/tizyx_evy_1.0.inst.cfg +++ b/resources/variants/tizyx_evy_1.0.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_classic.inst.cfg b/resources/variants/tizyx_evy_dual_classic.inst.cfg index 3aec98dbd5..b9239088e0 100644 --- a/resources/variants/tizyx_evy_dual_classic.inst.cfg +++ b/resources/variants/tizyx_evy_dual_classic.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg index e5a4d1968b..166d981765 100644 --- a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg +++ b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx_k25_0.2.inst.cfg index 7e47eade66..647adc64ac 100644 --- a/resources/variants/tizyx_k25_0.2.inst.cfg +++ b/resources/variants/tizyx_k25_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx_k25_0.3.inst.cfg index eb16b525c0..ef7e227f69 100644 --- a/resources/variants/tizyx_k25_0.3.inst.cfg +++ b/resources/variants/tizyx_k25_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx_k25_0.4.inst.cfg index efcaa8d51f..517aedabc6 100644 --- a/resources/variants/tizyx_k25_0.4.inst.cfg +++ b/resources/variants/tizyx_k25_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx_k25_0.5.inst.cfg index ee74d24961..c0d8702adc 100644 --- a/resources/variants/tizyx_k25_0.5.inst.cfg +++ b/resources/variants/tizyx_k25_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx_k25_0.6.inst.cfg index ad2bb9f9c9..0940ff6407 100644 --- a/resources/variants/tizyx_k25_0.6.inst.cfg +++ b/resources/variants/tizyx_k25_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx_k25_0.8.inst.cfg index 05126457ee..0e02a9210f 100644 --- a/resources/variants/tizyx_k25_0.8.inst.cfg +++ b/resources/variants/tizyx_k25_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx_k25_1.0.inst.cfg index 065ca23cfb..c19ea398bd 100644 --- a/resources/variants/tizyx_k25_1.0.inst.cfg +++ b/resources/variants/tizyx_k25_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg index a18cf745f7..98e77b7a84 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg index 65d86c419d..617980b5bf 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg index 274b371448..f0c959a26e 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg index 9b43296950..64f08d3f7b 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index 374ed2120a..cee40fd59d 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index 66aaf862fa..bd7a570554 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index 3dc24ea7f8..c636b2946e 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index 9179cd2249..c0e2e20a3d 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg index dd33048059..481e793ed1 100644 --- a/resources/variants/ultimaker2_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_olsson_0.4.inst.cfg index 77e1f523e0..eb3d4b1d4d 100644 --- a/resources/variants/ultimaker2_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_olsson_0.6.inst.cfg index 57a30eab82..78923886e7 100644 --- a/resources/variants/ultimaker2_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_olsson_0.8.inst.cfg index 2e47ebb5cf..c2972e3393 100644 --- a/resources/variants/ultimaker2_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index 938e17335d..43b5059192 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index cb7d2bf54b..9012398e96 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index 4a2523fca1..a7388e5f7a 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index 09ad29e698..9142396e68 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index fe7f3a3d48..02c818df63 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 18653c0973..c6429b2cfd 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index ddfb5f5415..d7c4d62e42 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 0801816a60..400e4d092c 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 6929f72e0a..01d465fe6a 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 78e1e90e41..d8a1044620 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 60396f6fef..5ba9dd311c 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index 97a4580117..b5914013b2 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index b57a3b221e..4a3f3e371f 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index b5fcecebf6..a8d706d2e4 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 66e913862e..3922e094b3 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index 6bde96fede..c6f578d263 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index 981e86e212..9ef3f515f0 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 3986306c43..5c1e9c449e 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 155ab6b67b..7c37ffaa76 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index 85b88daa96..882b248986 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index c7c909eded..442da77bbf 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 95de63a4d0..4af3273236 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index 542ffbe007..e2a573d64c 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aluminum.inst.cfg b/resources/variants/ultimaker_s5_aluminum.inst.cfg index 27e19f5016..3ee1f9f2f4 100644 --- a/resources/variants/ultimaker_s5_aluminum.inst.cfg +++ b/resources/variants/ultimaker_s5_aluminum.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = buildplate diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 1e9f25546c..f393da7ff3 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 44971fa47d..7b3634a923 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index 4a8cac944f..f788811f58 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg index 9e97939bff..d08fdbe494 100644 --- a/resources/variants/ultimaker_s5_glass.inst.cfg +++ b/resources/variants/ultimaker_s5_glass.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = buildplate From caec6ff27c7aa88523cadc8054e424084bd570a2 Mon Sep 17 00:00:00 2001 From: Dimitriovski Date: Tue, 19 Nov 2019 15:46:32 +0100 Subject: [PATCH 958/994] Changed the SettingVersion from CuraApplication.py CURA-6522_one_at_a_time_overlapping_build_area --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f88467d651..11784718ca 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -145,7 +145,7 @@ class CuraApplication(QtApplication): # SettingVersion represents the set of settings available in the machine/extruder definitions. # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible # changes of the settings. - SettingVersion = 10 + SettingVersion = 11 Created = False From 266f7d1f74c860eb80433ea248cc6da1d864c190 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 20 Nov 2019 16:39:38 +0100 Subject: [PATCH 959/994] Also bump up the version nr of FDMExtruder & FDMPrinter CURA-6522 --- resources/definitions/fdmextruder.def.json | 2 +- resources/definitions/fdmprinter.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index fcde530ebf..9d1e3c305e 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -6,7 +6,7 @@ "type": "extruder", "author": "Ultimaker", "manufacturer": "Unknown", - "setting_version": 10, + "setting_version": 11, "visible": false, "position": "0" }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index aafc01f219..3806a1f503 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7,7 +7,7 @@ "author": "Ultimaker", "category": "Other", "manufacturer": "Unknown", - "setting_version": 10, + "setting_version": 11, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, From ea02bdf40ad01dc98f9731383aad870e17b70c98 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 20 Nov 2019 16:49:51 +0100 Subject: [PATCH 960/994] Also bump up the setting version of files changed since this branch was branched CURA-6522 --- .../intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_global_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg | 2 +- resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg | 2 +- resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg index 35d0d86ab3..0f817ec515 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg index 2b656dbc35..7cfc4d2248 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg index aff1d9d9f0..61b24839c0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg index 92ea0837fe..383f85c8c0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg index 97c7ab325c..ecf95b0175 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg index e012264294..83f7004ecc 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg index 9debbb6d43..8fc12474f0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg index a57b040660..8f9be8a63d 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg index 0f31bcce25..82b36cc9e3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg index 0f10b8416b..acbccc4d08 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg index b6ea956563..5d8095dbd4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg index f26003ca30..5f166c94f5 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg index b20fdcb791..6b60e07201 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg index 3fc0006b3f..4d1a904d3f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg index 4138f62694..b334b7f101 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg index 3f5d3c566e..26774b8162 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg index 3b5d9fb3db..a2968f5060 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg index d71bb76b35..01440a2a20 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 10 +setting_version = 11 type = intent quality_type = normal intent_category = visual diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg index b94b8ee547..513b8b38ec 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 15171b26b8..e6ee0c75a7 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 8bc19aa8c0..3e150f7c4b 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 20642ff289..cca59c6d92 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index d68c3ade1a..84cfc04b72 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 8540b72c2f..72b6025929 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index d79cfa51fa..a7e4a49fbb 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = standard weight = 0 diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg index ee8b832034..c428f9e2b9 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg index 6f0adfb5e1..6790b63189 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle From fb4ce43f0cde76af3abed48376b0a9fb216b9be4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 21 Nov 2019 12:54:33 +0100 Subject: [PATCH 961/994] Prevent crashes when a variant could not be found This should not happen, but we've seen some cases where it would cause a crash, usually when a previous upgrade did something a bit weird (in this specific case; a printer with an empty variant, whereas it should have a variant). Since any change that the user will make will ensure that the variant is no longer empty (eg; any selection of a variant will mean it's no longer empty) and that there is no way back, it should be pretty safe to ignore the situation as it will resolve itself eventually CURA-6992 --- cura/Machines/Models/IntentModel.py | 4 ++++ cura/Settings/IntentManager.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentModel.py b/cura/Machines/Models/IntentModel.py index f5560bc94e..986f28a826 100644 --- a/cura/Machines/Models/IntentModel.py +++ b/cura/Machines/Models/IntentModel.py @@ -7,6 +7,7 @@ from PyQt5.QtCore import Qt, QObject, pyqtProperty, pyqtSignal import cura.CuraApplication from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Logger import Logger from cura.Machines.ContainerTree import ContainerTree from cura.Machines.MaterialNode import MaterialNode from cura.Machines.Models.MachineModelUtils import fetchLayerHeight @@ -101,6 +102,9 @@ class IntentModel(ListModel): for extruder in global_stack.extruderList: active_variant_name = extruder.variant.getMetaDataEntry("name") + if active_variant_name not in machine_node.variants: + Logger.log("w", "Could not find the variant %s", active_variant_name) + continue active_variant_node = machine_node.variants[active_variant_name] active_material_node = active_variant_node.materials[extruder.material.getMetaDataEntry("base_file")] nodes.add(active_material_node) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index 732e22d1bd..5133b401b4 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -39,7 +39,11 @@ class IntentManager(QObject): # an empty list if nothing was found. def intentMetadatas(self, definition_id: str, nozzle_name: str, material_base_file: str) -> List[Dict[str, Any]]: intent_metadatas = [] # type: List[Dict[str, Any]] - materials = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials + try: + materials = ContainerTree.getInstance().machines[definition_id].variants[nozzle_name].materials + except KeyError: + Logger.log("w", "Unable to find the machine %s or the variant %s", definition_id, nozzle_name) + materials = {} if material_base_file not in materials: return intent_metadatas From e937cdc9373682016d4f5a80b98621ea1928b4b4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 21 Nov 2019 13:10:01 +0100 Subject: [PATCH 962/994] Fix case where a global profile would be recognised as a extruder profile CURA-6991 --- cura/Machines/MachineNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 8d69ffdc8d..92f71b409b 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -140,7 +140,7 @@ class MachineNode(ContainerNode): elif groups_by_name[name].intent_category == "default": # Intent category should be stored as "default" if everything is default or as the intent if any of the extruder have an actual intent. groups_by_name[name].intent_category = quality_changes.get("intent_category", "default") - if quality_changes.get("position") is not None: # An extruder profile. + if quality_changes.get("position") is not None and quality_changes.get("position") != "None": # An extruder profile. groups_by_name[name].metadata_per_extruder[int(quality_changes["position"])] = quality_changes else: # Global profile. groups_by_name[name].metadata_for_global = quality_changes From 432ed02aa6eac01626b446777d6ae597ae2f23c3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 21 Nov 2019 14:08:51 +0100 Subject: [PATCH 963/994] Fix skip (or late) pause at height. Previously, the line after the layer change would also contain the z height. If not found, the could would break the per-line reading, and skip to the next layer. However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses). I just ignored the optimization and made it a continue. I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once. CURA-6965 --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 499214a0e9..17b4de88dd 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -219,7 +219,7 @@ class PauseAtHeight(Script): current_height = current_z - layer_0_z if current_height < pause_height: - break # Try the next layer. + continue # Scan the enitre layer, z-changes are not always on the same/first line. # Pause at layer else: From 997f19ba265f2d57a9f535ffddd333a047b77568 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 22 Nov 2019 11:02:19 +0100 Subject: [PATCH 964/994] Prevent flicking behavior for machine selection Contributes to #6684 --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 3 ++- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index e4a7a98308..fce616472f 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -91,7 +91,8 @@ Item // individual item has a dynamic change on its visibility, the ListView doesn't redraw itself. // The default value of cacheBuffer is platform-dependent, so we explicitly disable it here. cacheBuffer: 0 - + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 20000 // To prevent the flicking behavior. model: UM.DefinitionContainersModel { id: machineDefinitionsModel diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 95eff0465a..5a4f5ec7b7 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -71,7 +71,8 @@ Item section.property: "modelData.sectionName" section.criteria: ViewSection.FullString section.delegate: sectionHeading - + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 20000 // To prevent the flicking behavior. cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. Component.onCompleted: From 25f0460231fd970b73744fb3fe1c004dc68a5dc9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 22 Nov 2019 12:01:46 +0100 Subject: [PATCH 965/994] Add missing 'material break preparation temperature'. part of CURA-6971 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 1 + resources/definitions/fdmprinter.def.json | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 948751ab8b..52b204affc 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1104,6 +1104,7 @@ class XmlMaterialProfile(InstanceContainer): "anti ooze retract speed": "material_anti_ooze_retraction_speed", "break preparation position": "material_break_preparation_retracted_position", "break preparation speed": "material_break_preparation_speed", + "break preparation temperature": "material_break_preparation_temperature", "break position": "material_break_retracted_position", "break speed": "material_break_speed", "break temperature": "material_break_temperature" diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6a5163384e..82b3380ca3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2365,6 +2365,20 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "material_break_preparation_temperature": + { + "label": "Break Preparation Temperature", + "description": "The temperature used to purge material, should be roughly equal to the highest possible printing temperature.", + "type": "float", + "unit": "°C", + "default_value": 50, + "value": "material_print_temperature", + "enabled": false, + "minimum_value": "-273.15", + "maximum_value_warning": "300", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "material_break_retracted_position": { "label": "Break Retracted Position", From 80719d4724e445c8e1d75f80a712aea793b4ebfd Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 25 Nov 2019 11:13:07 +0100 Subject: [PATCH 966/994] Mark disabled extruders when saving project --- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index dfc6e3a9ca..6fe9607274 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -177,6 +177,7 @@ UM.Dialog return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id) } font.bold: true + enabled: modelData.isEnabled } Row { @@ -194,6 +195,7 @@ UM.Dialog return catalog.i18nc("@action:label", "Material") } width: Math.floor(scroll.width / 3) | 0 + enabled: modelData.isEnabled } Label { @@ -205,7 +207,7 @@ UM.Dialog } return materialName } - + enabled: modelData.isEnabled width: Math.floor(scroll.width / 3) | 0 } } From 8835a0cb999e45c1a757f955c4bb80dbd342dda9 Mon Sep 17 00:00:00 2001 From: Mathias Lyngklip Kjeldgaard Date: Tue, 26 Nov 2019 20:20:45 +0100 Subject: [PATCH 967/994] Fixed a typo in the title I noticed a typo in the title of the plugin, so that is fixed. I also added more info to the description. --- .../scripts/DisplayRemainingTimeOnLCD.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py index 9152ab65f9..7d9af10925 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py @@ -1,7 +1,7 @@ # Cura PostProcessingPlugin # Author: Mathias Lyngklip Kjeldgaard # Date: July 31, 2019 -# Modified: --- +# Modified: November 26, 2019 # Description: This plugin displayes the remaining time on the LCD of the printer # using the estimated print-time generated by Cura. @@ -23,7 +23,7 @@ class DisplayRemainingTimeOnLCD(Script): def getSettingDataString(self): return """{ - "name":"Disaplay Remaining Time on LCD", + "name":"Display Remaining Time on LCD", "key":"DisplayRemainingTimeOnLCD", "metadata": {}, "version": 2, @@ -32,7 +32,7 @@ class DisplayRemainingTimeOnLCD(Script): "TurnOn": { "label": "Enable", - "description": "When enabled, It will write Time Left: HHMMSS on the display", + "description": "When enabled, It will write Time Left: HHMMSS on the display. This is updated every layer.", "type": "bool", "default_value": false } From 9522ce2b7840f66417e17354e76728c1b25a5702 Mon Sep 17 00:00:00 2001 From: Dimitriovski Date: Wed, 27 Nov 2019 11:59:19 +0100 Subject: [PATCH 968/994] Added the project name in Window Title CURA-6978 --- resources/qml/Cura.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index f13f9e0ce9..d08b351ca0 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -21,7 +21,8 @@ UM.MainWindow id: base // Cura application window title - title: catalog.i18nc("@title:window", "Ultimaker Cura") + title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", "Ultimaker Cura") + backgroundColor: UM.Theme.getColor("viewport_background") UM.I18nCatalog From 084f55b6119f5e78d43bbe259fbf5cb06506a174 Mon Sep 17 00:00:00 2001 From: Dimitriovski Date: Wed, 27 Nov 2019 15:35:09 +0100 Subject: [PATCH 969/994] Removed hard-coded name for Ultimaker Cura to use applicationDisplayName CURA-6978 --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index d08b351ca0..8dcf60018f 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -21,7 +21,7 @@ UM.MainWindow id: base // Cura application window title - title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", "Ultimaker Cura") + title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", CuraApplication.applicationDisplayName) backgroundColor: UM.Theme.getColor("viewport_background") From 4fc32b036e36c150958d8438b252ca901b273e5d Mon Sep 17 00:00:00 2001 From: translucentfocus <26986716+translucentfocus@users.noreply.github.com> Date: Wed, 27 Nov 2019 11:46:07 -0600 Subject: [PATCH 970/994] Fixed typo Only correcting in master; may want to consider correcting in other branches --- .../PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py index 9152ab65f9..2ad9a22513 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py @@ -23,7 +23,7 @@ class DisplayRemainingTimeOnLCD(Script): def getSettingDataString(self): return """{ - "name":"Disaplay Remaining Time on LCD", + "name":"Display Remaining Time on LCD", "key":"DisplayRemainingTimeOnLCD", "metadata": {}, "version": 2, From 01f59568718be46e11ec33bad198671c12035f4e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 2 Dec 2019 12:11:10 +0100 Subject: [PATCH 971/994] Fix typo in content disposition header --- cura/PrinterOutput/NetworkedPrinterOutputDevice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 392df7bded..60be5bc8f3 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -154,7 +154,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): part = QHttpPart() if not content_header.startswith("form-data;"): - content_header = "form_data; " + content_header + content_header = "form-data; " + content_header part.setHeader(QNetworkRequest.ContentDispositionHeader, content_header) if content_type is not None: From 45bbb189ce8bbae173740e22ddf392fe296ad02b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 2 Dec 2019 13:59:50 +0100 Subject: [PATCH 972/994] Fix machine duplication when switching configuration --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d7a7586115..de6e270a86 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1247,6 +1247,8 @@ class MachineManager(QObject): if metadata_key in new_machine.getMetaData(): continue # Don't copy the already preset stuff. new_machine.setMetaDataEntry(metadata_key, self._global_container_stack.getMetaDataEntry(metadata_key)) + # Special case, group_id should be overwritten! + new_machine.setMetaDataEntry("group_id", self._global_container_stack.getMetaDataEntry("group_id")) else: Logger.log("i", "Found a %s with the key %s. Let's use it!", machine_name, self.activeMachineNetworkKey()) From eea4df12a70d5dcd01b03379c54bf19185dc0821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan-Luis=20de=20Sousa-Valadas=20Casta=C3=B1o?= Date: Mon, 2 Dec 2019 23:30:54 +0100 Subject: [PATCH 973/994] Spanish i18n fix fillament weight --- resources/i18n/es_ES/cura.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 8956c138ef..f971746925 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -2890,7 +2890,7 @@ msgstr "Coste del filamento" #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" -msgstr "Anchura del filamento" +msgstr "Peso del filamento" #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" From 726561bf309616107ad874d4e508b3a3ec9e5701 Mon Sep 17 00:00:00 2001 From: Jeff Kazules Date: Tue, 3 Dec 2019 13:39:50 +0100 Subject: [PATCH 974/994] Increase printer size and add disallowed areas With the stock firmware of the Ender 3, the size of the original printer was wrong, causing the model to land in a different place on the build plate. This led people to believe that the printer could take bigger prints. However it couldn't; it was just not allowing to print all the way down to the coordinate origin at 0,0. This makes the printer bigger but also adds disallowed areas so that you can't print anything near 0,0. Fixes #6267. --- resources/definitions/creality_ender3.def.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 645be52bc8..e0b651deea 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -9,9 +9,14 @@ }, "overrides": { "machine_name": { "default_value": "Creality Ender-3" }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 220 }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 235 }, "machine_height": { "default_value": 250 }, + "machine_disallowed_areas": { + "default_value": [ + [[-117.5, 117.5], [-117.5, 108], [117.5, 108], [117.5, 117.5]], + [[-117.5, -108], [-117.5, -117.5], [117.5, -117.5], [117.5, -108]] + ]}, "machine_head_polygon": { "default_value": [ [-1, 1], [-1, -1], From 74d919a5d201342dd75d38611b7787d80c7492b5 Mon Sep 17 00:00:00 2001 From: Dimitriovski Date: Tue, 3 Dec 2019 14:40:54 +0100 Subject: [PATCH 975/994] Prevent deleting comments from Start/End G-codes by changing the comment_prefixes in ConfigParser CURA/6994 --- .../VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py | 2 +- .../VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py | 2 +- .../VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py index 1151d7101a..305cce16c6 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -239,7 +239,7 @@ class VersionUpgrade41to42(VersionUpgrade): # # This renames the renamed settings in the containers. def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialized) # Update version number. diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py index c15f1e0468..d6489f6d8b 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py @@ -104,7 +104,7 @@ class VersionUpgrade42to43(VersionUpgrade): # # This renames the renamed settings in the containers. def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialized) # Update version number. diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py index 40927fe3a0..8b69852cb2 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py @@ -52,7 +52,7 @@ class VersionUpgrade43to44(VersionUpgrade): # # This renames the renamed settings in the containers. def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialized) # Update version number. From 961cd937b4ac98d0dcaa9a8620f69bd0134e6499 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 4 Dec 2019 09:58:19 +0100 Subject: [PATCH 976/994] Correct start and end g-code According to the thread at #6673 this works. Fixes #6673. --- resources/definitions/vertex_k8400.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index dad50cffe8..c528ef82fc 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -58,10 +58,10 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + "default_value": "M104 T0 S{material_print_temperature_layer_0}\nG28 ;Home extruder\nG90 ;Absolute positioning\nM82 ;Extruder in absolute mode\nG1 Z1 F100\nG92 E0 ;Reset extruder position\nM109 T0 S{material_print_temperature_layer_0}\nG1 E20 F100\nG92 E0 ;Reset extruder position" }, "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" + "default_value": "G1 X0 Y0 Z130 ;Get extruder out of way\nM107 ;Turn off fan\n;Disable all extruders\nG91 ;Relative positioning\nT0\nG1 E-1 ;Reduce filament pressure\nM104 T0 S0\nG90 ;Absolute positioning\nG92 E0 ;Reset extruder position\nM140 S0 ;Disable heated bed\nM84 ;Turn steppers off" } } } \ No newline at end of file From e2db4e873dd74db6a74316fb8efe8089af9332f2 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 4 Dec 2019 14:28:30 +0100 Subject: [PATCH 977/994] Add paramteter to Config Parser constructor to prevent comments in Gcode to be remnoved by upgrade, as in CURA-6994 CURA-6522 --- .../VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py index 36ee2bac16..6af08e7d66 100644 --- a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py @@ -10,7 +10,7 @@ from UM.VersionUpgrade import VersionUpgrade class VersionUpgrade44to45(VersionUpgrade): def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialised) format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) From fc060f7724518ecd8cce251cb942da405da16802 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 4 Dec 2019 15:33:31 +0100 Subject: [PATCH 978/994] Do not show any object shadows in all_at_once mode. Also DRYed up the one_at_a_time check CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 46 +++++++++++++++++-------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 9a2a0b9c7a..852832b500 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -97,21 +97,23 @@ class ConvexHullDecorator(SceneNodeDecorator): return None # Parent can be None if node is just loaded. - if self._global_stack \ - and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ - and not self.hasGroupAsParent(self._node): + if self._is_singular_one_at_a_time_node(): hull = self.getConvexHullHeadFull() hull = self._add2DAdhesionMargin(hull) return hull return self._compute2DConvexHull() - ## Get the convex hull of the node with the full head size + ## For one at the time this is the convex hull of the node with the full head size + # In case of printing all at once this is None. def getConvexHullHeadFull(self) -> Optional[Polygon]: if self._node is None: return None - return self._compute2DConvexHeadFull() + if self._is_singular_one_at_a_time_node(): + return self._compute2DConvexHeadFull() + + return None @staticmethod def hasGroupAsParent(node: "SceneNode") -> bool: @@ -121,20 +123,19 @@ class ConvexHullDecorator(SceneNodeDecorator): return bool(parent.callDecoration("isGroup")) ## Get convex hull of the object + head size - # In case of printing all at once this is the same as the convex hull. + # In case of printing all at once this is None. # For one at the time this is area with intersection of mirrored head def getConvexHullHead(self) -> Optional[Polygon]: if self._node is None: return None if self._node.callDecoration("isNonPrintingMesh"): return None - if self._global_stack: - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): - head_with_fans = self._compute2DConvexHeadMin() - if head_with_fans is None: - return None - head_with_fans_with_adhesion_margin = self._add2DAdhesionMargin(head_with_fans) - return head_with_fans_with_adhesion_margin + if self._is_singular_one_at_a_time_node(): + head_with_fans = self._compute2DConvexHeadMin() + if head_with_fans is None: + return None + head_with_fans_with_adhesion_margin = self._add2DAdhesionMargin(head_with_fans) + return head_with_fans_with_adhesion_margin return None ## Get convex hull of the node @@ -147,10 +148,9 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._node.callDecoration("isNonPrintingMesh"): return None - if self._global_stack: - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): - # Printing one at a time and it's not an object in a group - return self._compute2DConvexHull() + if self._is_singular_one_at_a_time_node(): + # Printing one at a time and it's not an object in a group + return self._compute2DConvexHull() return None ## The same as recomputeConvexHull, but using a timer if it was set. @@ -175,9 +175,7 @@ class ConvexHullDecorator(SceneNodeDecorator): self._convex_hull_node = None return - if self._global_stack \ - and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ - and not self.hasGroupAsParent(self._node): + if self._is_singular_one_at_a_time_node(): # In one-at-a-time mode, every printed object gets it's own adhesion printing_area = self.getAdhesionArea() else: @@ -426,6 +424,14 @@ class ConvexHullDecorator(SceneNodeDecorator): return True return self.__isDescendant(root, node.getParent()) + ## True if print_sequence is one_at_a_time and _node is not part of a group + def _is_singular_one_at_a_time_node(self) -> bool: + if self._node is None: + return False + return self._global_stack \ + and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ + and not self.hasGroupAsParent(self._node) + _affected_settings = [ "adhesion_type", "raft_margin", "print_sequence", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "skirt_distance", "brim_line_count"] From 2d8a415a69325c862259bca50d0d21e3bc785e0d Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 11:08:55 +0100 Subject: [PATCH 979/994] Use the printing area (hull + adhesion for one-at-a-time) instead of convex hull for build volume collision detection. The convex hull is not suitable for this purpose because for one-at-a-time it includes the machine head polygon, which should be allowed to travel outside the build volume CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 23 ++++++++++++++--------- cura/Scene/CuraSceneNode.py | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 852832b500..d1d3510346 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -89,7 +89,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return self._add2DAdhesionMargin(hull) ## Get the unmodified 2D projected convex hull of the node (if any) - # In case of all-at-once, this includes adhesion and head+fans clearance + # In case of one-at-a-time, this includes adhesion and head+fans clearance def getConvexHull(self) -> Optional[Polygon]: if self._node is None: return None @@ -139,7 +139,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return None ## Get convex hull of the node - # In case of printing all at once this is the same as the convex hull. + # In case of printing all at once this None?? # For one at the time this is the area without the head. def getConvexHullBoundary(self) -> Optional[Polygon]: if self._node is None: @@ -153,6 +153,17 @@ class ConvexHullDecorator(SceneNodeDecorator): return self._compute2DConvexHull() return None + ## Get the buildplate polygon where will be printed + # In case of printing all at once this is the same as convex hull (no individual adhesion) + # For one at the time this includes the adhesion area + def getPrintingArea(self) -> Optional[Polygon]: + if self._is_singular_one_at_a_time_node(): + # In one-at-a-time mode, every printed object gets it's own adhesion + printing_area = self.getAdhesionArea() + else: + printing_area = self.getConvexHull() + return printing_area + ## The same as recomputeConvexHull, but using a timer if it was set. def recomputeConvexHullDelayed(self) -> None: if self._recompute_convex_hull_timer is not None: @@ -175,15 +186,9 @@ class ConvexHullDecorator(SceneNodeDecorator): self._convex_hull_node = None return - if self._is_singular_one_at_a_time_node(): - # In one-at-a-time mode, every printed object gets it's own adhesion - printing_area = self.getAdhesionArea() - else: - printing_area = self.getConvexHull() - if self._convex_hull_node: self._convex_hull_node.setParent(None) - hull_node = ConvexHullNode.ConvexHullNode(self._node, printing_area, self._raft_thickness, root) + hull_node = ConvexHullNode.ConvexHullNode(self._node, self.getPrintingArea(), self._raft_thickness, root) self._convex_hull_node = hull_node def _onSettingValueChanged(self, key: str, property_name: str) -> None: diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 4215c8fa84..eb609def5a 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -88,7 +88,7 @@ class CuraSceneNode(SceneNode): ## Return if any area collides with the convex hull of this scene node def collidesWithAreas(self, areas: List[Polygon]) -> bool: - convex_hull = self.callDecoration("getConvexHull") + convex_hull = self.callDecoration("getPrintingArea") if convex_hull: if not convex_hull.isValid(): return False From f4c68f4e7163b5819fffec3f861247bbba8b497b Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 11:47:07 +0100 Subject: [PATCH 980/994] Fix two mypy warnings CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index d1d3510346..d87a0bb351 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -99,6 +99,8 @@ class ConvexHullDecorator(SceneNodeDecorator): # Parent can be None if node is just loaded. if self._is_singular_one_at_a_time_node(): hull = self.getConvexHullHeadFull() + if hull is None: + return None hull = self._add2DAdhesionMargin(hull) return hull @@ -144,7 +146,7 @@ class ConvexHullDecorator(SceneNodeDecorator): def getConvexHullBoundary(self) -> Optional[Polygon]: if self._node is None: return None - + if self._node.callDecoration("isNonPrintingMesh"): return None @@ -433,9 +435,9 @@ class ConvexHullDecorator(SceneNodeDecorator): def _is_singular_one_at_a_time_node(self) -> bool: if self._node is None: return False - return self._global_stack \ - and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ - and not self.hasGroupAsParent(self._node) + return self._global_stack is not None \ + and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \ + and not self.hasGroupAsParent(self._node) _affected_settings = [ "adhesion_type", "raft_margin", "print_sequence", From 4ad954f23ecee1391ff93af38bfde445ecc57dc6 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 12:00:40 +0100 Subject: [PATCH 981/994] Fix TestCuraSceneNode CURA-6522 --- tests/TestCuraSceneNode.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/TestCuraSceneNode.py b/tests/TestCuraSceneNode.py index 47a4dc3cb0..9e2fcb1188 100644 --- a/tests/TestCuraSceneNode.py +++ b/tests/TestCuraSceneNode.py @@ -13,6 +13,9 @@ class MockedConvexHullDecorator(SceneNodeDecorator): def getConvexHull(self): return Polygon([[5, 5], [-5, 5], [-5, -5], [5, -5]]) + def getPrintingArea(self): + return Polygon([[5, 5], [-5, 5], [-5, -5], [5, -5]]) + class InvalidConvexHullDecorator(SceneNodeDecorator): def __init__(self): From dd8993e88cd8c8d69d9b15e52d5cb1221c689fbc Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 12:17:21 +0100 Subject: [PATCH 982/994] revert 0 buildvolume edgedisallowedsize for one_at_a_time Turns out that the artificial disallowed area around the inside of the build volume was necessary to take the brim into account when deciding whether a model was outside the buildvolume. The issue for which I removed this in the first place seems not to be an issue anymore due to other commits Reverts and e5fb9fb8 and e5c9bca CURA-6522 --- cura/BuildVolume.py | 2 +- tests/TestBuildVolume.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 809d392c10..aba94e8c60 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1102,7 +1102,7 @@ class BuildVolume(SceneNode): # If we are printing one at a time, we need to add the bed adhesion size to the disallowed areas of the objects if container_stack.getProperty("print_sequence", "value") == "one_at_a_time": - return 0 + return 0.1 bed_adhesion_size = self._calculateBedAdhesionSize(used_extruders) support_expansion = self._calculateSupportExpansion(self._global_container_stack) diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 4beb648c89..6ccb3d0fb7 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -386,5 +386,5 @@ class TestGetEdgeDisallowedSize: build_volume._global_container_stack = self.createMockedStack() with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"): with patch.dict(self.setting_property_dict, {"print_sequence": {"value": "one_at_a_time"}}): - assert build_volume.getEdgeDisallowedSize() == 0.0 + assert build_volume.getEdgeDisallowedSize() == 0.1 From c47aca2f1b2d25d626132a691cc4a1eb93547974 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 14:23:42 +0100 Subject: [PATCH 983/994] Break down the issue template header into sections. I fear people might simply ignore the header, which is surrounded by comment tags. Having headings for all important pieces of information might make them stand out more. --- .github/ISSUE_TEMPLATE.md | 42 ++++++++++++++++++++++------ .github/ISSUE_TEMPLATE/bug-report.md | 30 +++++++++++++++----- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8e56787aeb..10ebdd761c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,12 +1,18 @@ +--- +name: Bug report +about: Create a report to help us fix issues. +title: '' +labels: 'Type: Bug' +assignees: '' + +--- + @@ -15,20 +21,40 @@ Thank you for using Cura! (The version of the application this issue occurs with.) **Platform** -(Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) +(Information about the operating system the issue occurs on. Include at least the operating system. +In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) **Printer** -(Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.) +(Which printer was selected in Cura? **Reproduction steps** 1. Something you did. 2. Something you did next. +**Screenshot(s)** +Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a +screenshot is also a great help to tell them apart without downloading and opening a project file. Feel +free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After +(Problematic version of Cura) screenshots might work well, too. + **Actual results** (What happens after the above steps have been followed.) **Expected results** (What should happen after the above steps have been followed.) +**Project file** +Provide a project which clearly shows the bug. +Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings +you used, which is crucial to reproducing your problem. +To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. +If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work +well too. Please make sure the file is publicly available ie. "shared with everyone" + +**Log file** +It is important to provide a log file. It might provide us info about why a certain material was selected, or is not +compatible, for example. +Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues + **Additional information** -(Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.) +(Extra information relevant to the issue) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 749b8037c1..10ebdd761c 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -14,10 +14,6 @@ Before filing, PLEASE check if the issue already exists (either open or closed) Also, please note the application version in the title of the issue. For example: "[3.2.1] Cannot connect to 3rd-party printer". Please do NOT write things like "Request:" or "[BUG]" in the title; this is what labels are for. -It is also helpful to attach a project (.3mf or .curaproject) file and Cura log file so we can debug issues quicker. Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues - -To upload a project, try changing the extension to e.g. .curaproject.3mf.zip so that GitHub accepts uploading the file. Otherwise, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too. - Thank you for using Cura! --> @@ -25,20 +21,40 @@ Thank you for using Cura! (The version of the application this issue occurs with.) **Platform** -(Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) +(Information about the operating system the issue occurs on. Include at least the operating system. +In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) **Printer** -(Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.) +(Which printer was selected in Cura? **Reproduction steps** 1. Something you did. 2. Something you did next. +**Screenshot(s)** +Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a +screenshot is also a great help to tell them apart without downloading and opening a project file. Feel +free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After +(Problematic version of Cura) screenshots might work well, too. + **Actual results** (What happens after the above steps have been followed.) **Expected results** (What should happen after the above steps have been followed.) +**Project file** +Provide a project which clearly shows the bug. +Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings +you used, which is crucial to reproducing your problem. +To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. +If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work +well too. Please make sure the file is publicly available ie. "shared with everyone" + +**Log file** +It is important to provide a log file. It might provide us info about why a certain material was selected, or is not +compatible, for example. +Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues + **Additional information** -(Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.) +(Extra information relevant to the issue) From 2dc4681d913f816c4232673c6dcd7891ba17525f Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 6 Dec 2019 14:29:05 +0100 Subject: [PATCH 984/994] Remove some mid-sentence newlines from issue templates Newlines are tragically not ignored by Github when rendering issue\ templates, it seems --- .github/ISSUE_TEMPLATE.md | 15 +++++---------- .github/ISSUE_TEMPLATE/bug-report.md | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 10ebdd761c..02fc0f1a65 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -32,10 +32,8 @@ In the case of visual glitches/issues, also include information about your graph 2. Something you did next. **Screenshot(s)** -Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a -screenshot is also a great help to tell them apart without downloading and opening a project file. Feel -free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After -(Problematic version of Cura) screenshots might work well, too. +Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a screenshot is also a great help to tell them apart without downloading and opening a project file. +Feel free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After (Problematic version of Cura) screenshots might work well, too. **Actual results** (What happens after the above steps have been followed.) @@ -45,15 +43,12 @@ free to add text either inside or below the screenshots. Before (earlier, workin **Project file** Provide a project which clearly shows the bug. -Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings -you used, which is crucial to reproducing your problem. +Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings you used, which is crucial to reproducing your problem. To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. -If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work -well too. Please make sure the file is publicly available ie. "shared with everyone" +If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too. Please make sure the file is publicly available ie. "shared with everyone" **Log file** -It is important to provide a log file. It might provide us info about why a certain material was selected, or is not -compatible, for example. +It is important to provide a log file. It might provide us info about why a certain material was selected, or is not compatible, for example. Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues **Additional information** diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 10ebdd761c..02fc0f1a65 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -32,10 +32,8 @@ In the case of visual glitches/issues, also include information about your graph 2. Something you did next. **Screenshot(s)** -Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a -screenshot is also a great help to tell them apart without downloading and opening a project file. Feel -free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After -(Problematic version of Cura) screenshots might work well, too. +Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a screenshot is also a great help to tell them apart without downloading and opening a project file. +Feel free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After (Problematic version of Cura) screenshots might work well, too. **Actual results** (What happens after the above steps have been followed.) @@ -45,15 +43,12 @@ free to add text either inside or below the screenshots. Before (earlier, workin **Project file** Provide a project which clearly shows the bug. -Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings -you used, which is crucial to reproducing your problem. +Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings you used, which is crucial to reproducing your problem. To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. -If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work -well too. Please make sure the file is publicly available ie. "shared with everyone" +If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too. Please make sure the file is publicly available ie. "shared with everyone" **Log file** -It is important to provide a log file. It might provide us info about why a certain material was selected, or is not -compatible, for example. +It is important to provide a log file. It might provide us info about why a certain material was selected, or is not compatible, for example. Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues **Additional information** From 6aa8d060d5ecfb764d5b7ffe15f9415090647ad0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 9 Dec 2019 12:56:30 +0100 Subject: [PATCH 985/994] Make template a bit less intimidating and restore brackets again I think the 'why' of things is not always relevant and makes people prevent reading all of it. Keep it brief! And with all of this information that people tend to just leave there it's hard to find the actual changes that people made to the template. That's also why the brackets are important, so that it's easy to see that people didn't erase the original template text. We used to have HTML comment codes there but then people put the actual bug report inside the comments as well and nothing showed up, so this is somewhat of a middle ground that everyone understands, programmers and non-programmers. --- .github/ISSUE_TEMPLATE.md | 22 ++++++++-------------- .github/ISSUE_TEMPLATE/bug-report.md | 22 ++++++++-------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 02fc0f1a65..6934354a70 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -21,19 +21,17 @@ Thank you for using Cura! (The version of the application this issue occurs with.) **Platform** -(Information about the operating system the issue occurs on. Include at least the operating system. -In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) +(Information about the operating system the issue occurs on. Include at least the operating system and maybe GPU.) **Printer** -(Which printer was selected in Cura? +(Which printer was selected in Cura?) **Reproduction steps** -1. Something you did. -2. Something you did next. +1. (Something you did.) +2. (Something you did next.) **Screenshot(s)** -Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a screenshot is also a great help to tell them apart without downloading and opening a project file. -Feel free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After (Problematic version of Cura) screenshots might work well, too. +(Image showing the problem, perhaps before/after images.) **Actual results** (What happens after the above steps have been followed.) @@ -42,14 +40,10 @@ Feel free to add text either inside or below the screenshots. Before (earlier, w (What should happen after the above steps have been followed.) **Project file** -Provide a project which clearly shows the bug. -Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings you used, which is crucial to reproducing your problem. -To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. -If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too. Please make sure the file is publicly available ie. "shared with everyone" +(For slicing bugs, provide a project which clearly shows the bug, by going to File->Save. For big files you may need to use WeTransfer or similar file sharing sites.) **Log file** -It is important to provide a log file. It might provide us info about why a certain material was selected, or is not compatible, for example. -Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues +(See https://github.com/Ultimaker/Cura#logging-issues to find the log file to upload, or copy a relevant snippet from it.) **Additional information** -(Extra information relevant to the issue) +(Extra information relevant to the issue.) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 02fc0f1a65..6934354a70 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -21,19 +21,17 @@ Thank you for using Cura! (The version of the application this issue occurs with.) **Platform** -(Information about the operating system the issue occurs on. Include at least the operating system. -In the case of visual glitches/issues, also include information about your graphics drivers and GPU.) +(Information about the operating system the issue occurs on. Include at least the operating system and maybe GPU.) **Printer** -(Which printer was selected in Cura? +(Which printer was selected in Cura?) **Reproduction steps** -1. Something you did. -2. Something you did next. +1. (Something you did.) +2. (Something you did next.) **Screenshot(s)** -Adding screenshot(s) is a very good idea to identify what exactly the problem is. We get lots of bug reports and a screenshot is also a great help to tell them apart without downloading and opening a project file. -Feel free to add text either inside or below the screenshots. Before (earlier, working version of Cura) / After (Problematic version of Cura) screenshots might work well, too. +(Image showing the problem, perhaps before/after images.) **Actual results** (What happens after the above steps have been followed.) @@ -42,14 +40,10 @@ Feel free to add text either inside or below the screenshots. Before (earlier, w (What should happen after the above steps have been followed.) **Project file** -Provide a project which clearly shows the bug. -Rather than providing a model file, provide a project (.3mf or .curaproject) file. This will include all the settings you used, which is crucial to reproducing your problem. -To upload a project, try changing the extension to e.g. bug_example.3mf.zip so that GitHub accepts uploading the file. -If the file is too big, we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too. Please make sure the file is publicly available ie. "shared with everyone" +(For slicing bugs, provide a project which clearly shows the bug, by going to File->Save. For big files you may need to use WeTransfer or similar file sharing sites.) **Log file** -It is important to provide a log file. It might provide us info about why a certain material was selected, or is not compatible, for example. -Information about how to find the log file can be found at https://github.com/Ultimaker/Cura#logging-issues +(See https://github.com/Ultimaker/Cura#logging-issues to find the log file to upload, or copy a relevant snippet from it.) **Additional information** -(Extra information relevant to the issue) +(Extra information relevant to the issue.) From 64decc73453b9cb2b53355014b347287a9664c92 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:24:27 +0100 Subject: [PATCH 986/994] Change unselected intent to outline (dark theme) The unselected intent radio buttons in the default profiles are by default white-filled. This is fixed to have a white outline and be filled with the main background's color. CURA-6941 --- resources/qml/RadioCheckbar.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index dfd9ca8628..96afe5bb3c 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -14,6 +14,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") property color defaultItemColor: UM.Theme.getColor("small_button_active") + property color defaultItemFillColor: UM.Theme.getColor("main_background") property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize property int barSize: UM.Theme.getSize("slider_groove_radius").height @@ -135,6 +136,7 @@ Item radius: Math.round(width / 2) border.color: defaultItemColor + color: defaultItemFillColor Rectangle { From 5b9bd46ba3ea0c237b3f87d54823f5715a92ea9e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:31:43 +0100 Subject: [PATCH 987/994] Change active intent line to white The activated part of the intent lines will now be white instead of grey. CURA-6941 --- resources/themes/cura-dark/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 282004c3a9..a724fcc117 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -60,7 +60,7 @@ "small_button": [39, 44, 48, 0], "small_button_hover": [39, 44, 48, 255], - "small_button_active": [67, 72, 75, 255], + "small_button_active": [255, 255, 255, 255], "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], From c0ac03f2ae9a95843d7f6b827e0bdf2d09b76711 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:35:19 +0100 Subject: [PATCH 988/994] Change Custom profiles title similar to Default CURA-6941 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index c5a725285c..ff235a8a67 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -164,6 +164,7 @@ Popup visible: profilesList.visibleChildren.length > 1 anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width + color: UM.Theme.getColor("text_inactive") } Column From 7ba1db830a7c4cb4bc3f11d0084b25280109e7f7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 Dec 2019 13:00:29 +0100 Subject: [PATCH 989/994] Re-enable the retraction min travel setting CURA-6675 --- resources/definitions/fdmprinter.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d89992ecf6..5af0f93521 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2737,7 +2737,6 @@ "minimum_value": "0", "minimum_value_warning": "line_width * 1.5", "maximum_value_warning": "10", - "enabled": false, "settable_per_mesh": false, "settable_per_extruder": true }, From 1b80ec8fff6d6b71ec1fd5a286af100fda3a1de6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 Dec 2019 13:14:54 +0100 Subject: [PATCH 990/994] Fix incorrect casing Minor issue and I didn't want to send it back to todo *again* because of it. CURA-6522 --- cura/Scene/ConvexHullDecorator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index d87a0bb351..2a160f6069 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -97,7 +97,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return None # Parent can be None if node is just loaded. - if self._is_singular_one_at_a_time_node(): + if self._isSingularOneAtATimeNode(): hull = self.getConvexHullHeadFull() if hull is None: return None @@ -112,7 +112,7 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._node is None: return None - if self._is_singular_one_at_a_time_node(): + if self._isSingularOneAtATimeNode(): return self._compute2DConvexHeadFull() return None @@ -132,7 +132,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return None if self._node.callDecoration("isNonPrintingMesh"): return None - if self._is_singular_one_at_a_time_node(): + if self._isSingularOneAtATimeNode(): head_with_fans = self._compute2DConvexHeadMin() if head_with_fans is None: return None @@ -150,7 +150,7 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._node.callDecoration("isNonPrintingMesh"): return None - if self._is_singular_one_at_a_time_node(): + if self._isSingularOneAtATimeNode(): # Printing one at a time and it's not an object in a group return self._compute2DConvexHull() return None @@ -159,7 +159,7 @@ class ConvexHullDecorator(SceneNodeDecorator): # In case of printing all at once this is the same as convex hull (no individual adhesion) # For one at the time this includes the adhesion area def getPrintingArea(self) -> Optional[Polygon]: - if self._is_singular_one_at_a_time_node(): + if self._isSingularOneAtATimeNode(): # In one-at-a-time mode, every printed object gets it's own adhesion printing_area = self.getAdhesionArea() else: @@ -432,7 +432,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return self.__isDescendant(root, node.getParent()) ## True if print_sequence is one_at_a_time and _node is not part of a group - def _is_singular_one_at_a_time_node(self) -> bool: + def _isSingularOneAtATimeNode(self) -> bool: if self._node is None: return False return self._global_stack is not None \ From 6ae0e08b7dfb8c956ff06ad5e5dc5adbcfd11913 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 10 Dec 2019 13:19:10 +0100 Subject: [PATCH 991/994] Change RadioCheckbar active button color The RadioCheckbar active button is now using the slider_groove_fill value instead of the small_button_active value to avoid issues in case the small_button_active and small_button_text are used together. --- resources/qml/RadioCheckbar.qml | 2 +- resources/themes/cura-dark/theme.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 96afe5bb3c..0b8709fe7a 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -13,7 +13,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") - property color defaultItemColor: UM.Theme.getColor("small_button_active") + property color defaultItemColor: UM.Theme.getColor("slider_groove_fill") property color defaultItemFillColor: UM.Theme.getColor("main_background") property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index a724fcc117..282004c3a9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -60,7 +60,7 @@ "small_button": [39, 44, 48, 0], "small_button_hover": [39, 44, 48, 255], - "small_button_active": [255, 255, 255, 255], + "small_button_active": [67, 72, 75, 255], "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], From ba2c9cb21e184b174cf2f4b0fa1588aef3b7760d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Dec 2019 16:02:45 +0100 Subject: [PATCH 992/994] Fix JSON formatting of start g-code No newlines allowed. --- resources/definitions/creality_ender3.def.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index d668b5c26d..ab828c727b 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -31,18 +31,8 @@ [32, 34] ] }, - "machine_start_gcode": { "default_value": " - ; Ender 3 Custom Start G-code - G92 E0 ; Reset Extruder - G28 ; Home all axes - G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed - G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position - G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line - G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little - G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line - G92 E0 ; Reset Extruder - G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed - G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + "machine_start_gcode": { + "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "gantry_height": { "value": 25 } From 8aae5f7563bf4a3693997a58f974a589133b6075 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 10 Dec 2019 16:33:47 +0100 Subject: [PATCH 993/994] Fix: extra ConfigParsaer arg added to wrong call CURA-6522 --- .../VersionUpgrade44to45/VersionUpgrade44to45.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py index 6af08e7d66..1d278764f0 100644 --- a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py @@ -10,7 +10,7 @@ from UM.VersionUpgrade import VersionUpgrade class VersionUpgrade44to45(VersionUpgrade): def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) @@ -35,7 +35,7 @@ class VersionUpgrade44to45(VersionUpgrade): # # This renames the renamed settings in the containers. def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialized) # Update version number. From 537424c058fc7074e9c793c27b2c5a39c0f4db36 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Dec 2019 16:41:46 +0100 Subject: [PATCH 994/994] Add GitHub Actions --- .github/workflows/cicd.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000000..3a0b57d714 --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,13 @@ +--- +name: CI/CD +on: [push, pull_request] +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + container: ultimaker/cura-build-environment + steps: + - name: Checkout master + uses: actions/checkout@v1.2.0 + - name: Build and test + run: docker/build.sh